From 2297c38574c7312ab272879f3d1f86cd37b0fdf0 Mon Sep 17 00:00:00 2001 From: Christian Knaapen Date: Wed, 1 Sep 2021 14:51:44 +0200 Subject: [PATCH] WIP Update to 1.17 --- build - kopie.gradle | 159 ++++++++++++++++++ build.gradle | 8 +- .../EffortlessBuilding.java | 30 ++-- .../effortlessbuilding/EventHandler.java | 46 ++--- .../ModClientEventHandler.java | 8 +- .../effortlessbuilding/ModEventHandler.java | 6 +- .../buildmode/BaseBuildMode.java | 18 +- .../buildmode/BuildModes.java | 74 ++++---- .../buildmode/IBuildMode.java | 18 +- .../buildmode/ModeOptions.java | 8 +- .../buildmode/ModeSettingsManager.java | 14 +- .../buildmode/ThreeClicksBuildMode.java | 44 ++--- .../buildmode/TwoClicksBuildMode.java | 16 +- .../buildmode/buildmodes/Circle.java | 26 +-- .../buildmode/buildmodes/Cube.java | 16 +- .../buildmode/buildmodes/Cylinder.java | 14 +- .../buildmode/buildmodes/DiagonalLine.java | 22 +-- .../buildmode/buildmodes/DiagonalWall.java | 14 +- .../buildmode/buildmodes/Floor.java | 26 +-- .../buildmode/buildmodes/Line.java | 40 ++--- .../buildmode/buildmodes/Normal.java | 18 +- .../buildmode/buildmodes/NormalPlus.java | 18 +- .../buildmode/buildmodes/SlopeFloor.java | 14 +- .../buildmode/buildmodes/Sphere.java | 24 +-- .../buildmode/buildmodes/Wall.java | 30 ++-- .../buildmodifier/Array.java | 26 +-- .../buildmodifier/BlockSet.java | 12 +- .../buildmodifier/BuildModifiers.java | 58 +++---- .../buildmodifier/Mirror.java | 66 ++++---- .../ModifierSettingsManager.java | 14 +- .../buildmodifier/RadialMirror.java | 52 +++--- .../buildmodifier/UndoRedo.java | 40 ++--- .../ItemHandlerCapabilityProvider.java | 10 +- .../capability/ModeCapabilityManager.java | 20 +-- .../capability/ModifierCapabilityManager.java | 28 +-- .../command/CommandReach.java | 16 +- .../compatibility/CompatHelper.java | 12 +- .../gui/RandomizerBagContainer.java | 38 ++--- .../gui/RandomizerBagScreen.java | 20 +-- .../gui/buildmode/PlayerSettingsGui.java | 64 +++---- .../gui/buildmode/RadialMenu.java | 42 ++--- .../gui/buildmodifier/ArraySettingsGui.java | 30 ++-- .../gui/buildmodifier/MirrorSettingsGui.java | 64 +++---- .../buildmodifier/ModifierSettingsGui.java | 16 +- .../RadialMirrorSettingsGui.java | 66 ++++---- .../gui/elements/GuiCheckBoxFixed.java | 10 +- .../elements/GuiCollapsibleScrollEntry.java | 14 +- .../gui/elements/GuiIconButton.java | 28 +-- .../gui/elements/GuiNumberField.java | 60 +++---- .../gui/elements/GuiScrollPane.java | 58 +++---- .../gui/elements/SlotGui.java | 40 ++--- .../helper/InventoryHelper.java | 12 +- .../helper/ReachHelper.java | 18 +- .../helper/SurvivalHelper.java | 70 ++++---- .../item/ItemRandomizerBag.java | 110 ++++++------ .../item/ItemReachUpgrade1.java | 36 ++-- .../item/ItemReachUpgrade2.java | 38 +++-- .../item/ItemReachUpgrade3.java | 38 +++-- .../network/AddUndoMessage.java | 20 +-- .../network/BlockBrokenMessage.java | 30 ++-- .../network/BlockPlacedMessage.java | 30 ++-- .../network/CancelModeMessage.java | 10 +- .../network/ClearUndoMessage.java | 10 +- .../network/ModeActionMessage.java | 10 +- .../network/ModeSettingsMessage.java | 10 +- .../network/ModifierSettingsMessage.java | 18 +- .../network/PacketHandler.java | 2 +- .../network/RequestLookAtMessage.java | 18 +- .../network/TranslatedLogMessage.java | 10 +- .../effortlessbuilding/proxy/ClientProxy.java | 126 +++++++------- .../effortlessbuilding/proxy/IProxy.java | 6 +- .../effortlessbuilding/proxy/ServerProxy.java | 10 +- .../render/BlockPreviewRenderer.java | 88 +++++----- .../render/BuildRenderTypes.java | 90 +++++----- .../render/ModifierRenderer.java | 62 +++---- .../render/RenderHandler.java | 82 ++++----- .../render/ShaderHandler.java | 2 +- .../resources/META-INF/accesstransformer.cfg | 6 +- 78 files changed, 1389 insertions(+), 1188 deletions(-) create mode 100644 build - kopie.gradle diff --git a/build - kopie.gradle b/build - kopie.gradle new file mode 100644 index 0000000..1686e24 --- /dev/null +++ b/build - kopie.gradle @@ -0,0 +1,159 @@ +buildscript { + repositories { + // These repositories are only for Gradle plugins, put any other repositories in the repository block further below + maven { url = 'https://maven.minecraftforge.net' } + mavenCentral() + } + dependencies { + classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true + } +} +apply plugin: 'net.minecraftforge.gradle' +// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. +apply plugin: 'eclipse' +apply plugin: 'maven-publish' + +version = '1.17.1-2.24' +group = 'nl.requios.effortlessbuilding' // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = 'effortlessbuilding' + +// Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16. +java.toolchain.languageVersion = JavaLanguageVersion.of(16) + +minecraft { + // The mappings can be changed at any time and must be in the following format. + // Channel: Version: + // snapshot YYYYMMDD Snapshot are built nightly. + // stable # Stables are built at the discretion of the MCP team. + // official MCVersion Official field/method names from Mojang mapping files + // + // You must be aware of the Mojang license when using the 'official' mappings. + // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md + // + // 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.17.1' + + // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default. + + // Default run configurations. + // These can be tweaked, removed, or duplicated as needed. + runs { + client { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP) + property 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + + mods { + effortlessbuilding { + source sourceSets.main + } + } + } + + server { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP) + property 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + + mods { + effortlessbuilding { + source sourceSets.main + } + } + } + + data { + workingDirectory project.file('run') + + // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP) + property 'forge.logging.markers', 'REGISTRIES' + + // Recommended logging level for the console + property 'forge.logging.console.level', 'debug' + + // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. + args '--mod', 'effortlessbuilding', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/') + + mods { + effortlessbuilding { + source sourceSets.main + } + } + } + } +} + +// Include resources generated by data generators. +sourceSets.main.resources { srcDir 'src/generated/resources' } + +repositories { + // Put repositories for dependencies here + // ForgeGradle automatically adds the Forge maven and Maven Central for you + + // If you have mod jar dependencies in ./libs, you can declare them as a repository like so: + // flatDir { + // dir 'libs' + // } +} + +dependencies { + // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed + // that the dep is a ForgeGradle 'patcher' dependency, and its 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.17.1-37.0.50' + + // 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 + // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency + // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency + + // Examples using mod jars from ./libs + // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}") + + // For more info... + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +// Example for how to get properties into the manifest for reading by the runtime.. +jar { + manifest { + attributes([ + "Specification-Title": "effortlessbuilding", + "Specification-Vendor": "requios", + "Specification-Version": "1", // We are version 1 of ourselves + "Implementation-Title": project.name, + "Implementation-Version": "${version}", + "Implementation-Vendor" :"requios", + "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") + ]) + } +} + +// Example configuration to allow publishing using the maven-publish task +// This is the preferred method to reobfuscate your jar file +jar.finalizedBy('reobfJar') +// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing +//publish.dependsOn('reobfJar') + +publishing { + publications { + mavenJava(MavenPublication) { + artifact jar + } + } + repositories { + maven { + url "file:///${project.projectDir}/mcmodsrepo" + } + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle index 4727e68..e9d578c 100644 --- a/build.gradle +++ b/build.gradle @@ -12,12 +12,14 @@ apply plugin: 'net.minecraftforge.gradle' // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. apply plugin: 'eclipse' apply plugin: 'maven-publish' +apply from: 'https://raw.githubusercontent.com/SizableShrimp/Forge-Class-Remapper/main/classremapper.gradle' version = '1.16.3-2.24' group = 'nl.requios.effortlessbuilding' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'effortlessbuilding' -sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. +// Mojang ships Java 16 to end users in 1.17+ instead of Java 8 in 1.16 or lower, so your mod should target Java 16. +java.toolchain.languageVersion = JavaLanguageVersion.of(16) minecraft { // The mappings can be changed at any time, and must be in the following format. @@ -25,7 +27,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.16.5' + mappings channel: 'official', version: '1.17.1' 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 +91,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.16.3-34.0.9' + minecraft 'net.minecraftforge:forge:1.17.1-37.0.50' // You may put jars on which you depend on in ./libs or you may define them like so.. // compile "some.group:artifact:version:classifier" diff --git a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java index b658ff9..c0b72ca 100644 --- a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java +++ b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java @@ -1,13 +1,13 @@ package nl.requios.effortlessbuilding; -import net.minecraft.block.Block; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.item.Item; -import net.minecraft.util.ResourceLocation; +import net.minecraft.world.level.block.Block; +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.resources.ResourceLocation; import net.minecraft.util.registry.Registry; -import net.minecraft.util.text.StringTextComponent; +import net.minecraft.network.chat.TextComponent; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.capabilities.CapabilityManager; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -59,8 +59,8 @@ public class EffortlessBuilding { ITEM_REACH_UPGRADE_2, ITEM_REACH_UPGRADE_3 }; - public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, EffortlessBuilding.MODID); - public static final RegistryObject> RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("randomizer_bag", () -> registerContainer(RandomizerBagContainer::new)); + public static final DeferredRegister> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, EffortlessBuilding.MODID); + public static final RegistryObject> RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("randomizer_bag", () -> registerContainer(RandomizerBagContainer::new)); public static final ResourceLocation RANDOMIZER_BAG_GUI = new ResourceLocation(EffortlessBuilding.MODID, "randomizer_bag"); public static EffortlessBuilding instance; public static IProxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new); @@ -86,8 +86,8 @@ public class EffortlessBuilding { CONTAINERS.register(FMLJavaModLoadingContext.get().getModEventBus()); } - public static ContainerType registerContainer(IContainerFactory fact){ - ContainerType type = new ContainerType(fact); + public static MenuType registerContainer(IContainerFactory fact){ + MenuType type = new MenuType(fact); return type; } @@ -95,16 +95,16 @@ public class EffortlessBuilding { logger.info(msg); } - public static void log(PlayerEntity player, String msg) { + public static void log(Player player, String msg) { log(player, msg, false); } - public static void log(PlayerEntity player, String msg, boolean actionBar) { - player.displayClientMessage(new StringTextComponent(msg), actionBar); + public static void log(Player player, String msg, boolean actionBar) { + player.displayClientMessage(new TextComponent(msg), actionBar); } //Log with translation supported, call either on client or server (which then sends a message) - public static void logTranslate(PlayerEntity player, String prefix, String translationKey, String suffix, boolean actionBar) { + public static void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar) { proxy.logTranslate(player, prefix, translationKey, suffix, actionBar); } diff --git a/src/main/java/nl/requios/effortlessbuilding/EventHandler.java b/src/main/java/nl/requios/effortlessbuilding/EventHandler.java index ac51a93..594bef6 100644 --- a/src/main/java/nl/requios/effortlessbuilding/EventHandler.java +++ b/src/main/java/nl/requios/effortlessbuilding/EventHandler.java @@ -1,13 +1,13 @@ package nl.requios.effortlessbuilding; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.World; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.entity.Entity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.Level; import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.event.AttachCapabilitiesEvent; import net.minecraftforge.event.entity.player.PlayerEvent; @@ -37,7 +37,7 @@ public class EventHandler { @SubscribeEvent public static void attachCapabilities(AttachCapabilitiesEvent event) { if (event.getObject() instanceof FakePlayer) return; - if (event.getObject() instanceof PlayerEntity) { + if (event.getObject() instanceof Player) { event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_modifier"), new ModifierCapabilityManager.Provider()); event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_mode"), new ModeCapabilityManager.Provider()); } @@ -63,12 +63,12 @@ public class EventHandler { public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) { if (event.getWorld().isClientSide()) return; - if (!(event.getEntity() instanceof PlayerEntity)) return; + if (!(event.getEntity() instanceof Player)) return; if (event.getEntity() instanceof FakePlayer) return; //Cancel event if necessary - ServerPlayerEntity player = ((ServerPlayerEntity) event.getEntity()); + ServerPlayer player = ((ServerPlayer) event.getEntity()); BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode(); ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); @@ -112,8 +112,8 @@ public class EventHandler { BuildModes.onBlockBroken(event.getPlayer(), event.getPos(), false); //Add to undo stack in client - if (event.getPlayer() instanceof ServerPlayerEntity && event.getState() != null && event.getPos() != null) { - PacketDistributor.PacketTarget packetTarget = PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) event.getPlayer()); + if (event.getPlayer() instanceof ServerPlayer && event.getState() != null && event.getPos() != null) { + PacketDistributor.PacketTarget packetTarget = PacketDistributor.PLAYER.with(() -> (ServerPlayer) event.getPlayer()); if (packetTarget != null) PacketHandler.INSTANCE.send(packetTarget, new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.defaultBlockState())); } @@ -127,8 +127,8 @@ public class EventHandler { if (event.getPlayer() instanceof FakePlayer) return; - PlayerEntity player = event.getPlayer(); - World world = player.level; + Player player = event.getPlayer(); + Level world = player.level; BlockPos pos = event.getPos(); //EffortlessBuilding.log(player, String.valueOf(event.getNewSpeed())); @@ -162,7 +162,7 @@ public class EventHandler { @SubscribeEvent public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) { if (event.getPlayer() instanceof FakePlayer) return; - PlayerEntity player = event.getPlayer(); + Player player = event.getPlayer(); ModifierSettingsManager.handleNewPlayer(player); ModeSettingsManager.handleNewPlayer(player); } @@ -170,17 +170,17 @@ public class EventHandler { @SubscribeEvent public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) { if (event.getPlayer() instanceof FakePlayer) return; - PlayerEntity player = event.getPlayer(); + Player player = event.getPlayer(); if (player.getCommandSenderWorld().isClientSide) return; UndoRedo.clear(player); - PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new ClearUndoMessage()); + PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ClearUndoMessage()); } @SubscribeEvent public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) { if (event.getPlayer() instanceof FakePlayer) return; - PlayerEntity player = event.getPlayer(); + Player player = event.getPlayer(); ModifierSettingsManager.handleNewPlayer(player); ModeSettingsManager.handleNewPlayer(player); } @@ -188,7 +188,7 @@ public class EventHandler { @SubscribeEvent public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) { if (event.getPlayer() instanceof FakePlayer) return; - PlayerEntity player = event.getPlayer(); + Player player = event.getPlayer(); if (player.getCommandSenderWorld().isClientSide) return; //Set build mode to normal @@ -207,17 +207,17 @@ public class EventHandler { ModeSettingsManager.handleNewPlayer(player); UndoRedo.clear(player); - PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new ClearUndoMessage()); + PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ClearUndoMessage()); } @SubscribeEvent public static void onPlayerClone(PlayerEvent.Clone event) { if (event.getPlayer() instanceof FakePlayer) return; //Attach capabilities on death, otherwise crash - PlayerEntity oldPlayer = event.getOriginal(); + Player oldPlayer = event.getOriginal(); oldPlayer.revive(); - PlayerEntity newPlayer = event.getPlayer(); + Player newPlayer = event.getPlayer(); ModifierSettingsManager.setModifierSettings(newPlayer, ModifierSettingsManager.getModifierSettings(oldPlayer)); ModeSettingsManager.setModeSettings(newPlayer, ModeSettingsManager.getModeSettings(oldPlayer)); } diff --git a/src/main/java/nl/requios/effortlessbuilding/ModClientEventHandler.java b/src/main/java/nl/requios/effortlessbuilding/ModClientEventHandler.java index 71968f2..8233196 100644 --- a/src/main/java/nl/requios/effortlessbuilding/ModClientEventHandler.java +++ b/src/main/java/nl/requios/effortlessbuilding/ModClientEventHandler.java @@ -1,9 +1,9 @@ package nl.requios.effortlessbuilding; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.util.ResourceLocation; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.TextureStitchEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; @@ -37,10 +37,10 @@ public class ModClientEventHandler { } public static TextureAtlasSprite getBuildModeIcon(BuildModes.BuildModeEnum mode) { - return Minecraft.getInstance().getModelManager().getAtlas(AtlasTexture.LOCATION_BLOCKS).getSprite(buildModeIcons.get(mode)); + return Minecraft.getInstance().getModelManager().getAtlas(TextureAtlas.LOCATION_BLOCKS).getSprite(buildModeIcons.get(mode)); } public static TextureAtlasSprite getModeOptionIcon(ModeOptions.ActionEnum action) { - return Minecraft.getInstance().getModelManager().getAtlas(AtlasTexture.LOCATION_BLOCKS).getSprite(modeOptionIcons.get(action)); + return Minecraft.getInstance().getModelManager().getAtlas(TextureAtlas.LOCATION_BLOCKS).getSprite(modeOptionIcons.get(action)); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/ModEventHandler.java b/src/main/java/nl/requios/effortlessbuilding/ModEventHandler.java index 7001f50..869d63b 100644 --- a/src/main/java/nl/requios/effortlessbuilding/ModEventHandler.java +++ b/src/main/java/nl/requios/effortlessbuilding/ModEventHandler.java @@ -1,8 +1,8 @@ package nl.requios.effortlessbuilding; -import net.minecraft.block.Block; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; import net.minecraftforge.event.RegistryEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; import net.minecraftforge.fml.common.Mod; diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/BaseBuildMode.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/BaseBuildMode.java index 9ff2fb9..4835b72 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/BaseBuildMode.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/BaseBuildMode.java @@ -1,9 +1,9 @@ package nl.requios.effortlessbuilding.buildmode; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import java.util.Dictionary; import java.util.Hashtable; @@ -16,24 +16,24 @@ public abstract class BaseBuildMode implements IBuildMode { protected Dictionary rightClickServerTable = new Hashtable<>(); protected Dictionary firstPosTable = new Hashtable<>(); protected Dictionary sideHitTable = new Hashtable<>(); - protected Dictionary hitVecTable = new Hashtable<>(); + protected Dictionary hitVecTable = new Hashtable<>(); @Override - public void initialize(PlayerEntity player) { + public void initialize(Player player) { rightClickClientTable.put(player.getUUID(), 0); rightClickServerTable.put(player.getUUID(), 0); firstPosTable.put(player.getUUID(), BlockPos.ZERO); sideHitTable.put(player.getUUID(), Direction.UP); - hitVecTable.put(player.getUUID(), Vector3d.ZERO); + hitVecTable.put(player.getUUID(), Vec3.ZERO); } @Override - public Direction getSideHit(PlayerEntity player) { + public Direction getSideHit(Player player) { return sideHitTable.get(player.getUUID()); } @Override - public Vector3d getHitVec(PlayerEntity player) { + public Vec3 getHitVec(Player player) { return hitVecTable.get(player.getUUID()); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java index fad04d3..3be215e 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java @@ -1,11 +1,11 @@ package nl.requios.effortlessbuilding.buildmode; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmode.buildmodes.*; import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers; @@ -26,16 +26,16 @@ public class BuildModes { //Static variables are shared between client and server in singleplayer //We need them separate - public static Dictionary currentlyBreakingClient = new Hashtable<>(); - public static Dictionary currentlyBreakingServer = new Hashtable<>(); + public static Dictionary currentlyBreakingClient = new Hashtable<>(); + public static Dictionary currentlyBreakingServer = new Hashtable<>(); //Uses a network message to get the previous raytraceresult from the player //The server could keep track of all raytraceresults but this might lag with many players //Raytraceresult is needed for sideHit and hitVec - public static void onBlockPlacedMessage(PlayerEntity player, BlockPlacedMessage message) { + public static void onBlockPlacedMessage(Player player, BlockPlacedMessage message) { //Check if not in the middle of breaking - Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; + Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; if (currentlyBreaking.get(player) != null && currentlyBreaking.get(player)) { //Cancel breaking initializeMode(player); @@ -90,7 +90,7 @@ public class BuildModes { Direction sideHit = buildMode.instance.getSideHit(player); if (sideHit == null) sideHit = message.getSideHit(); - Vector3d hitVec = buildMode.instance.getHitVec(player); + Vec3 hitVec = buildMode.instance.getHitVec(player); if (hitVec == null) hitVec = message.getHitVec(); BuildModifiers.onBlockPlaced(player, coordinates, sideHit, hitVec, message.getPlaceStartPos()); @@ -102,15 +102,15 @@ public class BuildModes { } //Use a network message to break blocks in the distance using clientside mouse input - public static void onBlockBrokenMessage(PlayerEntity player, BlockBrokenMessage message) { + public static void onBlockBrokenMessage(Player player, BlockBrokenMessage message) { BlockPos startPos = message.isBlockHit() ? message.getBlockPos() : null; onBlockBroken(player, startPos, true); } - public static void onBlockBroken(PlayerEntity player, BlockPos startPos, boolean breakStartPos) { + public static void onBlockBroken(Player player, BlockPos startPos, boolean breakStartPos) { //Check if not in the middle of placing - Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; + Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; if (currentlyBreaking.get(player) != null && !currentlyBreaking.get(player)) { //Cancel placing initializeMode(player); @@ -128,7 +128,7 @@ public class BuildModes { //Get coordinates BuildModeEnum buildMode = modeSettings.getBuildMode(); - List coordinates = buildMode.instance.onRightClick(player, startPos, Direction.UP, Vector3d.ZERO, true); + List coordinates = buildMode.instance.onRightClick(player, startPos, Direction.UP, Vec3.ZERO, true); if (coordinates.isEmpty()) { currentlyBreaking.put(player, true); @@ -143,7 +143,7 @@ public class BuildModes { currentlyBreaking.remove(player); } - public static List findCoordinates(PlayerEntity player, BlockPos startPos, boolean skipRaytrace) { + public static List findCoordinates(Player player, BlockPos startPos, boolean skipRaytrace) { List coordinates = new ArrayList<>(); ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player); @@ -152,61 +152,61 @@ public class BuildModes { return coordinates; } - public static void initializeMode(PlayerEntity player) { + public static void initializeMode(Player player) { //Resetting mode, so not placing or breaking - Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; + Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; currentlyBreaking.remove(player); ModeSettingsManager.getModeSettings(player).getBuildMode().instance.initialize(player); } - public static boolean isCurrentlyPlacing(PlayerEntity player) { - Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; + public static boolean isCurrentlyPlacing(Player player) { + Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; return currentlyBreaking.get(player) != null && !currentlyBreaking.get(player); } - public static boolean isCurrentlyBreaking(PlayerEntity player) { - Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; + public static boolean isCurrentlyBreaking(Player player) { + Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; return currentlyBreaking.get(player) != null && currentlyBreaking.get(player); } //Either placing or breaking - public static boolean isActive(PlayerEntity player) { - Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; + public static boolean isActive(Player player) { + Dictionary currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer; return currentlyBreaking.get(player) != null; } //Find coordinates on a line bound by a plane - public static Vector3d findXBound(double x, Vector3d start, Vector3d look) { + public static Vec3 findXBound(double x, Vec3 start, Vec3 look) { //then y and z are double y = (x - start.x) / look.x * look.y + start.y; double z = (x - start.x) / look.x * look.z + start.z; - return new Vector3d(x, y, z); + return new Vec3(x, y, z); } //-- Common build mode functionality --// - public static Vector3d findYBound(double y, Vector3d start, Vector3d look) { + public static Vec3 findYBound(double y, Vec3 start, Vec3 look) { //then x and z are double x = (y - start.y) / look.y * look.x + start.x; double z = (y - start.y) / look.y * look.z + start.z; - return new Vector3d(x, y, z); + return new Vec3(x, y, z); } - public static Vector3d findZBound(double z, Vector3d start, Vector3d look) { + public static Vec3 findZBound(double z, Vec3 start, Vec3 look) { //then x and y are double x = (z - start.z) / look.z * look.x + start.x; double y = (z - start.z) / look.z * look.y + start.y; - return new Vector3d(x, y, z); + return new Vec3(x, y, z); } //Use this instead of player.getLookVec() in any buildmodes code - public static Vector3d getPlayerLookVec(PlayerEntity player) { - Vector3d lookVec = player.getLookAngle(); + public static Vec3 getPlayerLookVec(Player player) { + Vec3 lookVec = player.getLookAngle(); double x = lookVec.x; double y = lookVec.y; double z = lookVec.z; @@ -226,16 +226,16 @@ public class BuildModes { if (Math.abs(z - 1.0) < 0.0001) z = 0.9999; if (Math.abs(z + 1.0) < 0.0001) z = -0.9999; - return new Vector3d(x, y, z); + return new Vec3(x, y, z); } - public static boolean isCriteriaValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace, Vector3d lineBound, Vector3d planeBound, double distToPlayerSq) { + public static boolean isCriteriaValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace, Vec3 lineBound, Vec3 planeBound, double distToPlayerSq) { boolean intersects = false; if (!skipRaytrace) { //collision within a 1 block radius to selected is fine - RayTraceContext rayTraceContext = new RayTraceContext(start, lineBound, RayTraceContext.BlockMode.COLLIDER, RayTraceContext.FluidMode.NONE, player); - RayTraceResult rayTraceResult = player.level.clip(rayTraceContext); - intersects = rayTraceResult != null && rayTraceResult.getType() == RayTraceResult.Type.BLOCK && + ClipContext rayTraceContext = new ClipContext(start, lineBound, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, player); + HitResult rayTraceResult = player.level.clip(rayTraceContext); + intersects = rayTraceResult != null && rayTraceResult.getType() == HitResult.Type.BLOCK && planeBound.subtract(rayTraceResult.getLocation()).lengthSqr() > 4; } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/IBuildMode.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/IBuildMode.java index f097edc..dd5a82a 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/IBuildMode.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/IBuildMode.java @@ -1,25 +1,25 @@ package nl.requios.effortlessbuilding.buildmode; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import java.util.List; public interface IBuildMode { //Fired when a player selects a buildmode and when it needs to initializeMode - void initialize(PlayerEntity player); + void initialize(Player player); //Fired when a block would be placed //Return a list of coordinates where you want to place blocks - List onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace); + List onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace); //Fired continuously for visualization purposes - List findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace); + List findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace); - Direction getSideHit(PlayerEntity player); + Direction getSideHit(Player player); - Vector3d getHitVec(PlayerEntity player); + Vec3 getHitVec(Player player); } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java index eed4c76..101c6d5 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.buildmode; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.text.TextFormatting; +import net.minecraft.world.entity.player.Player; +import net.minecraft.ChatFormatting; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager; import nl.requios.effortlessbuilding.buildmodifier.UndoRedo; @@ -60,7 +60,7 @@ public class ModeOptions { } //Called on both client and server - public static void performAction(PlayerEntity player, ActionEnum action) { + public static void performAction(Player player, ActionEnum action) { if (action == null) return; switch (action) { @@ -73,7 +73,7 @@ public class ModeOptions { case REPLACE: ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace()); - EffortlessBuilding.log(player, "Set " + TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + ( + EffortlessBuilding.log(player, "Set " + ChatFormatting.GOLD + "Quick Replace " + ChatFormatting.RESET + ( modifierSettings.doQuickReplace() ? "on" : "off"), true); break; case OPEN_MODIFIER_SETTINGS: diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeSettingsManager.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeSettingsManager.java index b41d3db..d34b2c1 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeSettingsManager.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/ModeSettingsManager.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.buildmode; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.network.PacketDistributor; @@ -19,7 +19,7 @@ public class ModeSettingsManager { //Retrieves the buildsettings of a player through the modifierCapability capability //Never returns null @Nonnull - public static ModeSettings getModeSettings(PlayerEntity player) { + public static ModeSettings getModeSettings(Player player) { LazyOptional modeCapability = player.getCapability(ModeCapabilityManager.modeCapability, null); @@ -37,7 +37,7 @@ public class ModeSettingsManager { // throw new IllegalArgumentException("Player does not have modeCapability capability"); } - public static void setModeSettings(PlayerEntity player, ModeSettings modeSettings) { + public static void setModeSettings(Player player, ModeSettings modeSettings) { if (player == null) { EffortlessBuilding.log("Cannot set buildmode settings, player is null"); return; @@ -56,7 +56,7 @@ public class ModeSettingsManager { } } - public static String sanitize(ModeSettings modeSettings, PlayerEntity player) { + public static String sanitize(ModeSettings modeSettings, Player player) { int maxReach = ReachHelper.getMaxReach(player); String error = ""; @@ -65,7 +65,7 @@ public class ModeSettingsManager { return error; } - public static void handleNewPlayer(PlayerEntity player) { + public static void handleNewPlayer(Player player) { //Makes sure player has mode settings (if it doesnt it will create it) getModeSettings(player); @@ -73,7 +73,7 @@ public class ModeSettingsManager { if (!player.level.isClientSide) { //Send to client ModeSettingsMessage msg = new ModeSettingsMessage(getModeSettings(player)); - PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), msg); + PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), msg); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/ThreeClicksBuildMode.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/ThreeClicksBuildMode.java index 248898d..25cd050 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/ThreeClicksBuildMode.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/ThreeClicksBuildMode.java @@ -1,9 +1,9 @@ package nl.requios.effortlessbuilding.buildmode; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import nl.requios.effortlessbuilding.helper.ReachHelper; import java.util.*; @@ -12,18 +12,18 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode { protected Dictionary secondPosTable = new Hashtable<>(); //Finds height after floor has been chosen in buildmodes with 3 clicks - public static BlockPos findHeight(PlayerEntity player, BlockPos secondPos, boolean skipRaytrace) { - Vector3d look = BuildModes.getPlayerLookVec(player); - Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ()); + public static BlockPos findHeight(Player player, BlockPos secondPos, boolean skipRaytrace) { + Vec3 look = BuildModes.getPlayerLookVec(player); + Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ()); List criteriaList = new ArrayList<>(3); //X - Vector3d xBound = BuildModes.findXBound(secondPos.getX(), start, look); + Vec3 xBound = BuildModes.findXBound(secondPos.getX(), start, look); criteriaList.add(new HeightCriteria(xBound, secondPos, start)); //Z - Vector3d zBound = BuildModes.findZBound(secondPos.getZ(), start, look); + Vec3 zBound = BuildModes.findZBound(secondPos.getZ(), start, look); criteriaList.add(new HeightCriteria(zBound, secondPos, start)); //Remove invalid criteria @@ -56,13 +56,13 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode { } @Override - public void initialize(PlayerEntity player) { + public void initialize(Player player) { super.initialize(player); secondPosTable.put(player.getUUID(), BlockPos.ZERO); } @Override - public List onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace) { + public List onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) { List list = new ArrayList<>(); Dictionary rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable; @@ -104,7 +104,7 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode { } @Override - public List findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace) { + public List findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) { List list = new ArrayList<>(); Dictionary rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable; int rightClickNr = rightClickTable.get(player.getUUID()); @@ -173,24 +173,24 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode { } //Finds the place of the second block pos - protected abstract BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace); + protected abstract BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace); //Finds the place of the third block pos - protected abstract BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace); + protected abstract BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace); //After first and second pos are known, we want to visualize the blocks in a way (like floor for cube) - protected abstract List getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2); + protected abstract List getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2); //After first, second and third pos are known, we want all the blocks - protected abstract List getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3); + protected abstract List getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3); static class HeightCriteria { - Vector3d planeBound; - Vector3d lineBound; + Vec3 planeBound; + Vec3 lineBound; double distToLineSq; double distToPlayerSq; - HeightCriteria(Vector3d planeBound, BlockPos secondPos, Vector3d start) { + HeightCriteria(Vec3 planeBound, BlockPos secondPos, Vec3 start) { this.planeBound = planeBound; this.lineBound = toLongestLine(this.planeBound, secondPos); this.distToLineSq = this.lineBound.subtract(this.planeBound).lengthSqr(); @@ -198,14 +198,14 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode { } //Make it from a plane into a line, on y axis only - private Vector3d toLongestLine(Vector3d boundVec, BlockPos secondPos) { + private Vec3 toLongestLine(Vec3 boundVec, BlockPos secondPos) { BlockPos bound = new BlockPos(boundVec); - return new Vector3d(secondPos.getX(), bound.getY(), secondPos.getZ()); + return new Vec3(secondPos.getX(), bound.getY(), secondPos.getZ()); } //check if its not behind the player and its not too close and not too far //also check if raytrace from player to block does not intersect blocks - public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) { + public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) { return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq); } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/TwoClicksBuildMode.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/TwoClicksBuildMode.java index e4a36f1..8d3bf87 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/TwoClicksBuildMode.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/TwoClicksBuildMode.java @@ -1,9 +1,9 @@ package nl.requios.effortlessbuilding.buildmode; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import nl.requios.effortlessbuilding.helper.ReachHelper; import java.util.ArrayList; @@ -14,7 +14,7 @@ import java.util.UUID; public abstract class TwoClicksBuildMode extends BaseBuildMode { @Override - public List onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace) { + public List onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) { List list = new ArrayList<>(); Dictionary rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable; @@ -44,7 +44,7 @@ public abstract class TwoClicksBuildMode extends BaseBuildMode { } @Override - public List findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace) { + public List findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) { List list = new ArrayList<>(); Dictionary rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable; int rightClickNr = rightClickTable.get(player.getUUID()); @@ -79,8 +79,8 @@ public abstract class TwoClicksBuildMode extends BaseBuildMode { } //Finds the place of the second block pos based on criteria (floor must be on same height as first click, wall on same plane etc) - protected abstract BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace); + protected abstract BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace); //After first and second pos are known, we want all the blocks - protected abstract List getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2); + protected abstract List getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2); } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Circle.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Circle.java index 837e653..9f72642 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Circle.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Circle.java @@ -1,8 +1,8 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; +import net.minecraft.util.Mth; import nl.requios.effortlessbuilding.buildmode.ModeOptions; import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode; @@ -11,7 +11,7 @@ import java.util.List; public class Circle extends TwoClicksBuildMode { - public static List getCircleBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + public static List getCircleBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { List list = new ArrayList<>(); float centerX = x1; @@ -26,8 +26,8 @@ public class Circle extends TwoClicksBuildMode { z1 = (int) (centerZ - (z2 - centerZ)); } - float radiusX = MathHelper.abs(x2 - centerX); - float radiusZ = MathHelper.abs(z2 - centerZ); + float radiusX = Mth.abs(x2 - centerX); + float radiusZ = Mth.abs(z2 - centerZ); if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL) addCircleBlocks(list, x1, y1, z1, x2, y2, z2, centerX, centerZ, radiusX, radiusZ); @@ -66,24 +66,24 @@ public class Circle extends TwoClicksBuildMode { } private static float distance(float x1, float z1, float x2, float z2) { - return MathHelper.sqrt((x2 - x1) * (x2 - x1) + (z2 - z1) * (z2 - z1)); + return Mth.sqrt((x2 - x1) * (x2 - x1) + (z2 - z1) * (z2 - z1)); } public static float calculateEllipseRadius(float centerX, float centerZ, float radiusX, float radiusZ, int x, int z) { //https://math.stackexchange.com/questions/432902/how-to-get-the-radius-of-an-ellipse-at-a-specific-angle-by-knowing-its-semi-majo - float theta = (float) MathHelper.atan2(z - centerZ, x - centerX); - float part1 = radiusX * radiusX * MathHelper.sin(theta) * MathHelper.sin(theta); - float part2 = radiusZ * radiusZ * MathHelper.cos(theta) * MathHelper.cos(theta); - return radiusX * radiusZ / MathHelper.sqrt(part1 + part2); + float theta = (float) Mth.atan2(z - centerZ, x - centerX); + float part1 = radiusX * radiusX * Mth.sin(theta) * Mth.sin(theta); + float part2 = radiusZ * radiusZ * Mth.cos(theta) * Mth.cos(theta); + return radiusX * radiusZ / Mth.sqrt(part1 + part2); } @Override - protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { + protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) { return Floor.findFloor(player, firstPos, skipRaytrace); } @Override - protected List getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + protected List getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { return getCircleBlocks(player, x1, y1, z1, x2, y2, z2); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cube.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cube.java index 0348d7a..3a2fb1c 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cube.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cube.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; import nl.requios.effortlessbuilding.buildmode.ModeOptions; import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode; @@ -10,7 +10,7 @@ import java.util.List; public class Cube extends ThreeClicksBuildMode { - public static List getFloorBlocksUsingCubeFill(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + public static List getFloorBlocksUsingCubeFill(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { List list = new ArrayList<>(); if (ModeOptions.getCubeFill() == ModeOptions.ActionEnum.CUBE_SKELETON) @@ -21,7 +21,7 @@ public class Cube extends ThreeClicksBuildMode { return list; } - public static List getCubeBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + public static List getCubeBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { List list = new ArrayList<>(); switch (ModeOptions.getCubeFill()) { @@ -80,22 +80,22 @@ public class Cube extends ThreeClicksBuildMode { } @Override - protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { + protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) { return Floor.findFloor(player, firstPos, skipRaytrace); } @Override - protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { + protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { return findHeight(player, secondPos, skipRaytrace); } @Override - protected List getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + protected List getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { return getFloorBlocksUsingCubeFill(player, x1, y1, z1, x2, y2, z2); } @Override - protected List getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { + protected List getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { return getCubeBlocks(player, x1, y1, z1, x3, y3, z3); } } \ No newline at end of file diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cylinder.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cylinder.java index 0568faf..1c303bf 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cylinder.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cylinder.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode; import java.util.ArrayList; @@ -9,7 +9,7 @@ import java.util.List; public class Cylinder extends ThreeClicksBuildMode { - public static List getCylinderBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { + public static List getCylinderBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { List list = new ArrayList<>(); //Get circle blocks (using CIRCLE_START and FILL options built-in) @@ -29,22 +29,22 @@ public class Cylinder extends ThreeClicksBuildMode { } @Override - public BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { + public BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) { return Floor.findFloor(player, firstPos, skipRaytrace); } @Override - public BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { + public BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { return findHeight(player, secondPos, skipRaytrace); } @Override - public List getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + public List getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2); } @Override - public List getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { + public List getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { return getCylinderBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3); } } \ No newline at end of file diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalLine.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalLine.java index 847d0ee..25365f4 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalLine.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalLine.java @@ -1,8 +1,8 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode; import java.util.ArrayList; @@ -11,15 +11,15 @@ import java.util.List; public class DiagonalLine extends ThreeClicksBuildMode { //Add diagonal line from first to second - public static List getDiagonalLineBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, float sampleMultiplier) { + public static List getDiagonalLineBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, float sampleMultiplier) { List list = new ArrayList<>(); - Vector3d first = new Vector3d(x1, y1, z1).add(0.5, 0.5, 0.5); - Vector3d second = new Vector3d(x2, y2, z2).add(0.5, 0.5, 0.5); + Vec3 first = new Vec3(x1, y1, z1).add(0.5, 0.5, 0.5); + Vec3 second = new Vec3(x2, y2, z2).add(0.5, 0.5, 0.5); int iterations = (int) Math.ceil(first.distanceTo(second) * sampleMultiplier); for (double t = 0; t <= 1.0; t += 1.0 / iterations) { - Vector3d lerp = first.add(second.subtract(first).scale(t)); + Vec3 lerp = first.add(second.subtract(first).scale(t)); BlockPos candidate = new BlockPos(lerp); //Only add if not equal to the last in the list if (list.isEmpty() || !list.get(list.size() - 1).equals(candidate)) @@ -30,23 +30,23 @@ public class DiagonalLine extends ThreeClicksBuildMode { } @Override - protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { + protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) { return Floor.findFloor(player, firstPos, skipRaytrace); } @Override - protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { + protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { return findHeight(player, secondPos, skipRaytrace); } @Override - protected List getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + protected List getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { //Add diagonal line from first to second return getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 10); } @Override - protected List getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { + protected List getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { //Add diagonal line from first to third return getDiagonalLineBlocks(player, x1, y1, z1, x3, y3, z3, 10); } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalWall.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalWall.java index 89895c1..c2d039a 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalWall.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalWall.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode; import java.util.ArrayList; @@ -10,7 +10,7 @@ import java.util.List; public class DiagonalWall extends ThreeClicksBuildMode { //Add diagonal wall from first to second - public static List getDiagonalWallBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { + public static List getDiagonalWallBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { List list = new ArrayList<>(); //Get diagonal line blocks @@ -30,22 +30,22 @@ public class DiagonalWall extends ThreeClicksBuildMode { } @Override - protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { + protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) { return Floor.findFloor(player, firstPos, skipRaytrace); } @Override - protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { + protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { return findHeight(player, secondPos, skipRaytrace); } @Override - protected List getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + protected List getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { return DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 1); } @Override - protected List getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { + protected List getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { return getDiagonalWallBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3); } } \ No newline at end of file diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Floor.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Floor.java index e5a705b..97735cc 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Floor.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Floor.java @@ -1,8 +1,8 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import nl.requios.effortlessbuilding.buildmode.BuildModes; import nl.requios.effortlessbuilding.buildmode.ModeOptions; import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode; @@ -13,14 +13,14 @@ import java.util.List; public class Floor extends TwoClicksBuildMode { - public static BlockPos findFloor(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { - Vector3d look = BuildModes.getPlayerLookVec(player); - Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ()); + public static BlockPos findFloor(Player player, BlockPos firstPos, boolean skipRaytrace) { + Vec3 look = BuildModes.getPlayerLookVec(player); + Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ()); List criteriaList = new ArrayList<>(3); //Y - Vector3d yBound = BuildModes.findYBound(firstPos.getY(), start, look); + Vec3 yBound = BuildModes.findYBound(firstPos.getY(), start, look); criteriaList.add(new Criteria(yBound, start)); //Remove invalid criteria @@ -36,7 +36,7 @@ public class Floor extends TwoClicksBuildMode { return new BlockPos(selected.planeBound); } - public static List getFloorBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + public static List getFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { List list = new ArrayList<>(); if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL) @@ -66,27 +66,27 @@ public class Floor extends TwoClicksBuildMode { } @Override - protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { + protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) { return findFloor(player, firstPos, skipRaytrace); } @Override - protected List getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + protected List getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { return getFloorBlocks(player, x1, y1, z1, x2, y2, z2); } static class Criteria { - Vector3d planeBound; + Vec3 planeBound; double distToPlayerSq; - Criteria(Vector3d planeBound, Vector3d start) { + Criteria(Vec3 planeBound, Vec3 start) { this.planeBound = planeBound; this.distToPlayerSq = this.planeBound.subtract(start).lengthSqr(); } //check if its not behind the player and its not too close and not too far //also check if raytrace from player to block does not intersect blocks - public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) { + public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) { return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq); } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Line.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Line.java index d3bec06..3b7aa33 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Line.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Line.java @@ -1,8 +1,8 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import nl.requios.effortlessbuilding.buildmode.BuildModes; import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode; import nl.requios.effortlessbuilding.helper.ReachHelper; @@ -12,22 +12,22 @@ import java.util.List; public class Line extends TwoClicksBuildMode { - public static BlockPos findLine(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { - Vector3d look = BuildModes.getPlayerLookVec(player); - Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ()); + public static BlockPos findLine(Player player, BlockPos firstPos, boolean skipRaytrace) { + Vec3 look = BuildModes.getPlayerLookVec(player); + Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ()); List criteriaList = new ArrayList<>(3); //X - Vector3d xBound = BuildModes.findXBound(firstPos.getX(), start, look); + Vec3 xBound = BuildModes.findXBound(firstPos.getX(), start, look); criteriaList.add(new Criteria(xBound, firstPos, start)); //Y - Vector3d yBound = BuildModes.findYBound(firstPos.getY(), start, look); + Vec3 yBound = BuildModes.findYBound(firstPos.getY(), start, look); criteriaList.add(new Criteria(yBound, firstPos, start)); //Z - Vector3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look); + Vec3 zBound = BuildModes.findZBound(firstPos.getZ(), start, look); criteriaList.add(new Criteria(zBound, firstPos, start)); //Remove invalid criteria @@ -61,7 +61,7 @@ public class Line extends TwoClicksBuildMode { return new BlockPos(selected.lineBound); } - public static List getLineBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + public static List getLineBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { List list = new ArrayList<>(); if (x1 != x2) { @@ -94,22 +94,22 @@ public class Line extends TwoClicksBuildMode { } @Override - protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { + protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) { return findLine(player, firstPos, skipRaytrace); } @Override - protected List getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + protected List getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { return getLineBlocks(player, x1, y1, z1, x2, y2, z2); } static class Criteria { - Vector3d planeBound; - Vector3d lineBound; + Vec3 planeBound; + Vec3 lineBound; double distToLineSq; double distToPlayerSq; - Criteria(Vector3d planeBound, BlockPos firstPos, Vector3d start) { + Criteria(Vec3 planeBound, BlockPos firstPos, Vec3 start) { this.planeBound = planeBound; this.lineBound = toLongestLine(this.planeBound, firstPos); this.distToLineSq = this.lineBound.subtract(this.planeBound).lengthSqr(); @@ -118,27 +118,27 @@ public class Line extends TwoClicksBuildMode { //Make it from a plane into a line //Select the axis that is longest - private Vector3d toLongestLine(Vector3d boundVec, BlockPos firstPos) { + private Vec3 toLongestLine(Vec3 boundVec, BlockPos firstPos) { BlockPos bound = new BlockPos(boundVec); BlockPos firstToSecond = bound.subtract(firstPos); firstToSecond = new BlockPos(Math.abs(firstToSecond.getX()), Math.abs(firstToSecond.getY()), Math.abs(firstToSecond.getZ())); int longest = Math.max(firstToSecond.getX(), Math.max(firstToSecond.getY(), firstToSecond.getZ())); if (longest == firstToSecond.getX()) { - return new Vector3d(bound.getX(), firstPos.getY(), firstPos.getZ()); + return new Vec3(bound.getX(), firstPos.getY(), firstPos.getZ()); } if (longest == firstToSecond.getY()) { - return new Vector3d(firstPos.getX(), bound.getY(), firstPos.getZ()); + return new Vec3(firstPos.getX(), bound.getY(), firstPos.getZ()); } if (longest == firstToSecond.getZ()) { - return new Vector3d(firstPos.getX(), firstPos.getY(), bound.getZ()); + return new Vec3(firstPos.getX(), firstPos.getY(), bound.getZ()); } return null; } //check if its not behind the player and its not too close and not too far //also check if raytrace from player to block does not intersect blocks - public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) { + public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) { return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq); } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Normal.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Normal.java index 582a9be..3f71149 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Normal.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Normal.java @@ -1,9 +1,9 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import nl.requios.effortlessbuilding.buildmode.IBuildMode; import java.util.ArrayList; @@ -11,31 +11,31 @@ import java.util.List; public class Normal implements IBuildMode { @Override - public void initialize(PlayerEntity player) { + public void initialize(Player player) { } @Override - public List onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace) { + public List onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) { List list = new ArrayList<>(); if (blockPos != null) list.add(blockPos); return list; } @Override - public List findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace) { + public List findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) { List list = new ArrayList<>(); if (blockPos != null) list.add(blockPos); return list; } @Override - public Direction getSideHit(PlayerEntity player) { + public Direction getSideHit(Player player) { return null; } @Override - public Vector3d getHitVec(PlayerEntity player) { + public Vec3 getHitVec(Player player) { return null; } } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/NormalPlus.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/NormalPlus.java index 9a03f38..07c3403 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/NormalPlus.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/NormalPlus.java @@ -1,9 +1,9 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import nl.requios.effortlessbuilding.buildmode.IBuildMode; import java.util.ArrayList; @@ -11,31 +11,31 @@ import java.util.List; public class NormalPlus implements IBuildMode { @Override - public void initialize(PlayerEntity player) { + public void initialize(Player player) { } @Override - public List onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace) { + public List onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) { List list = new ArrayList<>(); if (blockPos != null) list.add(blockPos); return list; } @Override - public List findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace) { + public List findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) { List list = new ArrayList<>(); if (blockPos != null) list.add(blockPos); return list; } @Override - public Direction getSideHit(PlayerEntity player) { + public Direction getSideHit(Player player) { return null; } @Override - public Vector3d getHitVec(PlayerEntity player) { + public Vec3 getHitVec(Player player) { return null; } } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/SlopeFloor.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/SlopeFloor.java index a897156..b20a33f 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/SlopeFloor.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/SlopeFloor.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; import nl.requios.effortlessbuilding.buildmode.ModeOptions; import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode; import nl.requios.effortlessbuilding.helper.ReachHelper; @@ -12,7 +12,7 @@ import java.util.List; public class SlopeFloor extends ThreeClicksBuildMode { //Add slope floor from first to second - public static List getSlopeFloorBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { + public static List getSlopeFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { List list = new ArrayList<>(); int axisLimit = ReachHelper.getMaxBlocksPerAxis(player); @@ -74,22 +74,22 @@ public class SlopeFloor extends ThreeClicksBuildMode { } @Override - protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { + protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) { return Floor.findFloor(player, firstPos, skipRaytrace); } @Override - protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { + protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { return findHeight(player, secondPos, skipRaytrace); } @Override - protected List getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + protected List getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { return Floor.getFloorBlocks(player, x1, y1, z1, x2, y2, z2); } @Override - protected List getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { + protected List getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { return getSlopeFloorBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3); } } \ No newline at end of file diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Sphere.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Sphere.java index bd6ed40..0625b18 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Sphere.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Sphere.java @@ -1,8 +1,8 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; +import net.minecraft.util.Mth; import nl.requios.effortlessbuilding.buildmode.ModeOptions; import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode; @@ -11,7 +11,7 @@ import java.util.List; public class Sphere extends ThreeClicksBuildMode { - public static List getSphereBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { + public static List getSphereBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { List list = new ArrayList<>(); float centerX = x1; @@ -29,9 +29,9 @@ public class Sphere extends ThreeClicksBuildMode { z1 = (int) (centerZ - (z2 - centerZ)); } - float radiusX = MathHelper.abs(x2 - centerX); - float radiusY = MathHelper.abs(y3 - centerY); - float radiusZ = MathHelper.abs(z2 - centerZ); + float radiusX = Mth.abs(x2 - centerX); + float radiusY = Mth.abs(y3 - centerY); + float radiusZ = Mth.abs(z2 - centerZ); if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL) addSphereBlocks(list, x1, y1, z1, x3, y3, z3, centerX, centerY, centerZ, radiusX, radiusY, radiusZ); @@ -76,7 +76,7 @@ public class Sphere extends ThreeClicksBuildMode { } private static float distance(float x1, float y1, float z1, float x2, float y2, float z2) { - return MathHelper.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1) + (z2 - z1) * (z2 - z1)); + return Mth.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1) + (z2 - z1) * (z2 - z1)); } public static float calculateSpheroidRadius(float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ, int x, int y, int z) { @@ -89,22 +89,22 @@ public class Sphere extends ThreeClicksBuildMode { } @Override - public BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { + public BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) { return Floor.findFloor(player, firstPos, skipRaytrace); } @Override - public BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { + public BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) { return findHeight(player, secondPos, skipRaytrace); } @Override - public List getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + public List getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2); } @Override - public List getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { + public List getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) { return getSphereBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3); } } \ No newline at end of file diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Wall.java b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Wall.java index 3f5cb5e..5f7e493 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Wall.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Wall.java @@ -1,8 +1,8 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import nl.requios.effortlessbuilding.buildmode.BuildModes; import nl.requios.effortlessbuilding.buildmode.ModeOptions; import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode; @@ -13,18 +13,18 @@ import java.util.List; public class Wall extends TwoClicksBuildMode { - public static BlockPos findWall(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { - Vector3d look = BuildModes.getPlayerLookVec(player); - Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ()); + public static BlockPos findWall(Player player, BlockPos firstPos, boolean skipRaytrace) { + Vec3 look = BuildModes.getPlayerLookVec(player); + Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ()); List criteriaList = new ArrayList<>(3); //X - Vector3d xBound = BuildModes.findXBound(firstPos.getX(), start, look); + Vec3 xBound = BuildModes.findXBound(firstPos.getX(), start, look); criteriaList.add(new Criteria(xBound, firstPos, start, look)); //Z - Vector3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look); + Vec3 zBound = BuildModes.findZBound(firstPos.getZ(), start, look); criteriaList.add(new Criteria(zBound, firstPos, start, look)); //Remove invalid criteria @@ -51,7 +51,7 @@ public class Wall extends TwoClicksBuildMode { return new BlockPos(selected.planeBound); } - public static List getWallBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + public static List getWallBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { List list = new ArrayList<>(); if (x1 == x2) { @@ -104,30 +104,30 @@ public class Wall extends TwoClicksBuildMode { } @Override - protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) { + protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) { return findWall(player, firstPos, skipRaytrace); } @Override - protected List getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) { + protected List getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) { return getWallBlocks(player, x1, y1, z1, x2, y2, z2); } static class Criteria { - Vector3d planeBound; + Vec3 planeBound; double distToPlayerSq; double angle; - Criteria(Vector3d planeBound, BlockPos firstPos, Vector3d start, Vector3d look) { + Criteria(Vec3 planeBound, BlockPos firstPos, Vec3 start, Vec3 look) { this.planeBound = planeBound; this.distToPlayerSq = this.planeBound.subtract(start).lengthSqr(); - Vector3d wall = this.planeBound.subtract(Vector3d.atLowerCornerOf(firstPos)); + Vec3 wall = this.planeBound.subtract(Vec3.atLowerCornerOf(firstPos)); this.angle = wall.x * look.x + wall.z * look.z; //dot product ignoring y (looking up/down should not affect this angle) } //check if its not behind the player and its not too close and not too far //also check if raytrace from player to block does not intersect blocks - public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) { + public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) { return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq); } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java index aa57236..bc45182 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java @@ -1,13 +1,13 @@ package nl.requios.effortlessbuilding.buildmodifier; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.math.vector.Vector3i; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.core.Direction; +import net.minecraft.world.InteractionHand; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; +import net.minecraft.core.Vec3i; import net.minecraftforge.items.IItemHandler; import nl.requios.effortlessbuilding.item.ItemRandomizerBag; @@ -16,7 +16,7 @@ import java.util.List; public class Array { - public static List findCoordinates(PlayerEntity player, BlockPos startPos) { + public static List findCoordinates(Player player, BlockPos startPos) { List coordinates = new ArrayList<>(); //find arraysettings for the player @@ -24,7 +24,7 @@ public class Array { if (!isEnabled(a)) return coordinates; BlockPos pos = startPos; - Vector3i offset = new Vector3i(a.offset.getX(), a.offset.getY(), a.offset.getZ()); + Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ()); for (int i = 0; i < a.count; i++) { pos = pos.offset(offset); @@ -34,7 +34,7 @@ public class Array { return coordinates; } - public static List findBlockStates(PlayerEntity player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List itemStacks) { + public static List findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List itemStacks) { List blockStates = new ArrayList<>(); //find arraysettings for the player that placed the block @@ -42,7 +42,7 @@ public class Array { if (!isEnabled(a)) return blockStates; BlockPos pos = startPos; - Vector3i offset = new Vector3i(a.offset.getX(), a.offset.getY(), a.offset.getZ()); + Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ()); //Randomizer bag synergy IItemHandler bagInventory = null; @@ -57,7 +57,7 @@ public class Array { if (bagInventory != null) { itemStack = ItemRandomizerBag.pickRandomStack(bagInventory); blockState = BuildModifiers - .getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vector3d(0, 0, 0), Hand.MAIN_HAND); + .getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vec3(0, 0, 0), InteractionHand.MAIN_HAND); } //blockState = blockState.getBlock().getStateForPlacement(player.world, pos, ) diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BlockSet.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BlockSet.java index f9017ff..3f13564 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BlockSet.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BlockSet.java @@ -1,8 +1,8 @@ package nl.requios.effortlessbuilding.buildmodifier; -import net.minecraft.block.BlockState; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import java.util.List; @@ -10,11 +10,11 @@ public class BlockSet { private final List coordinates; private final List previousBlockStates; private final List newBlockStates; - private final Vector3d hitVec; + private final Vec3 hitVec; private final BlockPos firstPos; private final BlockPos secondPos; - public BlockSet(List coordinates, List previousBlockStates, List newBlockStates, Vector3d hitVec, + public BlockSet(List coordinates, List previousBlockStates, List newBlockStates, Vec3 hitVec, BlockPos firstPos, BlockPos secondPos) { this.coordinates = coordinates; this.previousBlockStates = previousBlockStates; @@ -36,7 +36,7 @@ public class BlockSet { return newBlockStates; } - public Vector3d getHitVec() { + public Vec3 getHitVec() { return hitVec; } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java index a87fca2..a67bc4c 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java @@ -1,19 +1,19 @@ package nl.requios.effortlessbuilding.buildmodifier; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.BlockItemUseContext; -import net.minecraft.item.ItemStack; -import net.minecraft.item.ItemUseContext; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.UseOnContext; +import net.minecraft.core.Direction; +import net.minecraft.world.InteractionHand; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.Vec3; +import net.minecraft.world.level.Level; import nl.requios.effortlessbuilding.compatibility.CompatHelper; import nl.requios.effortlessbuilding.helper.InventoryHelper; import nl.requios.effortlessbuilding.helper.SurvivalHelper; @@ -28,12 +28,12 @@ import java.util.List; public class BuildModifiers { //Called from BuildModes - public static void onBlockPlaced(PlayerEntity player, List startCoordinates, Direction sideHit, Vector3d hitVec, boolean placeStartPos) { - World world = player.level; + public static void onBlockPlaced(Player player, List startCoordinates, Direction sideHit, Vec3 hitVec, boolean placeStartPos) { + Level world = player.level; ItemRandomizerBag.renewRandomness(); //Format hitvec to 0.x - hitVec = new Vector3d(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), Math.abs(hitVec.z - ((int) hitVec.z))); + hitVec = new Vec3(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), Math.abs(hitVec.z - ((int) hitVec.z))); //find coordinates and blockstates List coordinates = findCoordinates(player, startCoordinates); @@ -95,8 +95,8 @@ public class BuildModifiers { } } - public static void onBlockBroken(PlayerEntity player, List startCoordinates, boolean breakStartPos) { - World world = player.level; + public static void onBlockBroken(Player player, List startCoordinates, boolean breakStartPos) { + Level world = player.level; List coordinates = findCoordinates(player, startCoordinates); @@ -146,12 +146,12 @@ public class BuildModifiers { //add to undo stack BlockPos firstPos = startCoordinates.get(0); BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1); - Vector3d hitVec = new Vector3d(0.5, 0.5, 0.5); + Vec3 hitVec = new Vec3(0.5, 0.5, 0.5); UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos)); } - public static List findCoordinates(PlayerEntity player, List posList) { + public static List findCoordinates(Player player, List posList) { List coordinates = new ArrayList<>(); //Add current blocks being placed too coordinates.addAll(posList); @@ -172,18 +172,18 @@ public class BuildModifiers { return coordinates; } - public static List findCoordinates(PlayerEntity player, BlockPos blockPos) { + public static List findCoordinates(Player player, BlockPos blockPos) { return findCoordinates(player, new ArrayList<>(Collections.singletonList(blockPos))); } - public static List findBlockStates(PlayerEntity player, List posList, Vector3d hitVec, Direction facing, List itemStacks) { + public static List findBlockStates(Player player, List posList, Vec3 hitVec, Direction facing, List itemStacks) { List blockStates = new ArrayList<>(); itemStacks.clear(); //Get itemstack - ItemStack itemStack = player.getItemInHand(Hand.MAIN_HAND); + ItemStack itemStack = player.getItemInHand(InteractionHand.MAIN_HAND); if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) { - itemStack = player.getItemInHand(Hand.OFF_HAND); + itemStack = player.getItemInHand(InteractionHand.OFF_HAND); } if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) { return blockStates; @@ -198,13 +198,13 @@ public class BuildModifiers { //Add blocks in posList first for (BlockPos blockPos : posList) { if (!(itemStack.getItem() instanceof BlockItem)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack); - BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, Hand.MAIN_HAND); + BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, InteractionHand.MAIN_HAND); blockStates.add(blockState); itemStacks.add(itemBlock); } for (BlockPos blockPos : posList) { - BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, Hand.MAIN_HAND); + BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, InteractionHand.MAIN_HAND); List arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks); blockStates.addAll(arrayBlockStates); @@ -239,8 +239,8 @@ public class BuildModifiers { modifierSettings.doQuickReplace(); } - public static BlockState getBlockStateFromItem(ItemStack itemStack, PlayerEntity player, BlockPos blockPos, Direction facing, Vector3d hitVec, Hand hand) { - return Block.byItem(itemStack.getItem()).getStateForPlacement(new BlockItemUseContext(new ItemUseContext(player, hand, new BlockRayTraceResult(hitVec, facing, blockPos, false)))); + public static BlockState getBlockStateFromItem(ItemStack itemStack, Player player, BlockPos blockPos, Direction facing, Vec3 hitVec, InteractionHand hand) { + return Block.byItem(itemStack.getItem()).getStateForPlacement(new BlockPlaceContext(new UseOnContext(player, hand, new BlockHitResult(hitVec, facing, blockPos, false)))); } //Returns true if equal (or both null) diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java index dcd8f5d..6090a65 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java @@ -1,23 +1,29 @@ package nl.requios.effortlessbuilding.buildmodifier; import net.minecraft.block.*; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.state.properties.Half; -import net.minecraft.state.properties.SlabType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.level.block.state.properties.Half; +import net.minecraft.world.level.block.state.properties.SlabType; +import net.minecraft.core.Direction; +import net.minecraft.world.InteractionHand; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.items.IItemHandler; import nl.requios.effortlessbuilding.item.ItemRandomizerBag; import java.util.ArrayList; import java.util.List; +import net.minecraft.world.level.block.DirectionalBlock; +import net.minecraft.world.level.block.DispenserBlock; +import net.minecraft.world.level.block.SlabBlock; +import net.minecraft.world.level.block.StairBlock; +import net.minecraft.world.level.block.state.BlockState; + public class Mirror { - public static List findCoordinates(PlayerEntity player, BlockPos startPos) { + public static List findCoordinates(Player player, BlockPos startPos) { List coordinates = new ArrayList<>(); //find mirrorsettings for the player @@ -57,7 +63,7 @@ public class Mirror { coordinates.add(newBlockPos); } - public static List findBlockStates(PlayerEntity player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List itemStacks) { + public static List findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List itemStacks) { List blockStates = new ArrayList<>(); //find mirrorsettings for the player @@ -71,17 +77,17 @@ public class Mirror { } if (m.mirrorX) - blockStateMirrorX(player, m, startPos, blockState, bagInventory, itemStack, Hand.MAIN_HAND, blockStates, itemStacks); + blockStateMirrorX(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks); if (m.mirrorY) - blockStateMirrorY(player, m, startPos, blockState, bagInventory, itemStack, Hand.MAIN_HAND, blockStates, itemStacks); + blockStateMirrorY(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks); if (m.mirrorZ) - blockStateMirrorZ(player, m, startPos, blockState, bagInventory, itemStack, Hand.MAIN_HAND, blockStates, itemStacks); + blockStateMirrorZ(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks); return blockStates; } - private static void blockStateMirrorX(PlayerEntity player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState, - IItemHandler bagInventory, ItemStack itemStack, Hand hand, List blockStates, List itemStacks) { + private static void blockStateMirrorX(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState, + IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List blockStates, List itemStacks) { //find mirror position double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5); BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ()); @@ -89,11 +95,11 @@ public class Mirror { //Randomizer bag synergy if (bagInventory != null) { itemStack = ItemRandomizerBag.pickRandomStack(bagInventory); - oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vector3d(0, 0, 0), hand); + oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand); } //Find blockstate - BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.util.Mirror.FRONT_BACK); + BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.world.level.block.Mirror.FRONT_BACK); //Store blockstate and itemstack blockStates.add(newBlockState); @@ -105,8 +111,8 @@ public class Mirror { blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks); } - private static void blockStateMirrorY(PlayerEntity player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState, - IItemHandler bagInventory, ItemStack itemStack, Hand hand, List blockStates, List itemStacks) { + private static void blockStateMirrorY(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState, + IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List blockStates, List itemStacks) { //find mirror position double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5); BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ()); @@ -114,7 +120,7 @@ public class Mirror { //Randomizer bag synergy if (bagInventory != null) { itemStack = ItemRandomizerBag.pickRandomStack(bagInventory); - oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vector3d(0, 0, 0), hand); + oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand); } //Find blockstate @@ -128,8 +134,8 @@ public class Mirror { blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks); } - private static void blockStateMirrorZ(PlayerEntity player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState, - IItemHandler bagInventory, ItemStack itemStack, Hand hand, List blockStates, List itemStacks) { + private static void blockStateMirrorZ(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState, + IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List blockStates, List itemStacks) { //find mirror position double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5); BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z); @@ -137,11 +143,11 @@ public class Mirror { //Randomizer bag synergy if (bagInventory != null) { itemStack = ItemRandomizerBag.pickRandomStack(bagInventory); - oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vector3d(0, 0, 0), hand); + oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand); } //Find blockstate - BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.util.Mirror.LEFT_RIGHT); + BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.world.level.block.Mirror.LEFT_RIGHT); //Store blockstate and itemstack blockStates.add(newBlockState); @@ -159,11 +165,11 @@ public class Mirror { private static BlockState getVerticalMirror(BlockState blockState) { //Stairs - if (blockState.getBlock() instanceof StairsBlock) { - if (blockState.getValue(StairsBlock.HALF) == Half.BOTTOM) { - return blockState.setValue(StairsBlock.HALF, Half.TOP); + if (blockState.getBlock() instanceof StairBlock) { + if (blockState.getValue(StairBlock.HALF) == Half.BOTTOM) { + return blockState.setValue(StairBlock.HALF, Half.TOP); } else { - return blockState.setValue(StairsBlock.HALF, Half.BOTTOM); + return blockState.setValue(StairBlock.HALF, Half.BOTTOM); } } @@ -201,7 +207,7 @@ public class Mirror { public static class MirrorSettings { public boolean enabled = false; - public Vector3d position = new Vector3d(0.5, 64.5, 0.5); + public Vec3 position = new Vec3(0.5, 64.5, 0.5); public boolean mirrorX = true, mirrorY = false, mirrorZ = false; public int radius = 10; public boolean drawLines = true, drawPlanes = true; @@ -209,7 +215,7 @@ public class Mirror { public MirrorSettings() { } - public MirrorSettings(boolean mirrorEnabled, Vector3d position, boolean mirrorX, boolean mirrorY, boolean mirrorZ, int radius, boolean drawLines, boolean drawPlanes) { + public MirrorSettings(boolean mirrorEnabled, Vec3 position, boolean mirrorX, boolean mirrorY, boolean mirrorZ, int radius, boolean drawLines, boolean drawPlanes) { this.enabled = mirrorEnabled; this.position = position; this.mirrorX = mirrorX; diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/ModifierSettingsManager.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/ModifierSettingsManager.java index 9050a8b..65de1f6 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/ModifierSettingsManager.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/ModifierSettingsManager.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.buildmodifier; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.network.PacketDistributor; @@ -20,7 +20,7 @@ public class ModifierSettingsManager { //Retrieves the buildsettings of a player through the modifierCapability capability //Never returns null @Nonnull - public static ModifierSettings getModifierSettings(PlayerEntity player) { + public static ModifierSettings getModifierSettings(Player player) { LazyOptional modifierCapability = player.getCapability(ModifierCapabilityManager.modifierCapability, null); @@ -38,7 +38,7 @@ public class ModifierSettingsManager { // throw new IllegalArgumentException("Player does not have modifierCapability capability"); } - public static void setModifierSettings(PlayerEntity player, ModifierSettings modifierSettings) { + public static void setModifierSettings(Player player, ModifierSettings modifierSettings) { if (player == null) { EffortlessBuilding.log("Cannot set buildsettings, player is null"); return; @@ -56,7 +56,7 @@ public class ModifierSettingsManager { } } - public static String sanitize(ModifierSettings modifierSettings, PlayerEntity player) { + public static String sanitize(ModifierSettings modifierSettings, Player player) { int maxReach = ReachHelper.getMaxReach(player); String error = ""; @@ -110,7 +110,7 @@ public class ModifierSettingsManager { return error; } - public static void handleNewPlayer(PlayerEntity player) { + public static void handleNewPlayer(Player player) { //Makes sure player has modifier settings (if it doesnt it will create it) getModifierSettings(player); @@ -118,7 +118,7 @@ public class ModifierSettingsManager { if (!player.level.isClientSide) { //Send to client ModifierSettingsMessage msg = new ModifierSettingsMessage(getModifierSettings(player)); - PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), msg); + PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), msg); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java index bd3c066..968dbf6 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java @@ -1,15 +1,15 @@ package nl.requios.effortlessbuilding.buildmodifier; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.Mirror; -import net.minecraft.util.Rotation; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.core.Direction; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.level.block.Mirror; +import net.minecraft.world.level.block.Rotation; +import net.minecraft.core.BlockPos; +import net.minecraft.util.Mth; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.items.IItemHandler; import nl.requios.effortlessbuilding.item.ItemRandomizerBag; @@ -18,7 +18,7 @@ import java.util.List; public class RadialMirror { - public static List findCoordinates(PlayerEntity player, BlockPos startPos) { + public static List findCoordinates(Player player, BlockPos startPos) { List coordinates = new ArrayList<>(); //find radial mirror settings for the player @@ -28,10 +28,10 @@ public class RadialMirror { //get angle between slices double sliceAngle = 2 * Math.PI / r.slices; - Vector3d startVec = new Vector3d(startPos.getX() + 0.5f, startPos.getY() + 0.5f, startPos.getZ() + 0.5f); - Vector3d relStartVec = startVec.subtract(r.position); + Vec3 startVec = new Vec3(startPos.getX() + 0.5f, startPos.getY() + 0.5f, startPos.getZ() + 0.5f); + Vec3 relStartVec = startVec.subtract(r.position); - double startAngleToCenter = MathHelper.atan2(relStartVec.x, relStartVec.z); + double startAngleToCenter = Mth.atan2(relStartVec.x, relStartVec.z); if (startAngleToCenter < 0) startAngleToCenter += Math.PI; double startAngleInSlice = startAngleToCenter % sliceAngle; @@ -43,7 +43,7 @@ public class RadialMirror { curAngle = curAngle - startAngleInSlice + (sliceAngle - startAngleInSlice); } - Vector3d relNewVec = relStartVec.yRot((float) curAngle); + Vec3 relNewVec = relStartVec.yRot((float) curAngle); BlockPos newBlockPos = new BlockPos(r.position.add(relNewVec)); if (!coordinates.contains(newBlockPos) && !newBlockPos.equals(startPos)) coordinates.add(newBlockPos); } @@ -51,7 +51,7 @@ public class RadialMirror { return coordinates; } - public static List findBlockStates(PlayerEntity player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List itemStacks) { + public static List findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List itemStacks) { List blockStates = new ArrayList<>(); List coordinates = new ArrayList<>(); //to keep track of duplicates @@ -63,10 +63,10 @@ public class RadialMirror { //get angle between slices double sliceAngle = 2 * Math.PI / r.slices; - Vector3d startVec = new Vector3d(startPos.getX() + 0.5f, startPos.getY() + 0.5f, startPos.getZ() + 0.5f); - Vector3d relStartVec = startVec.subtract(r.position); + Vec3 startVec = new Vec3(startPos.getX() + 0.5f, startPos.getY() + 0.5f, startPos.getZ() + 0.5f); + Vec3 relStartVec = startVec.subtract(r.position); - double startAngleToCenter = MathHelper.atan2(relStartVec.x, relStartVec.z); + double startAngleToCenter = Mth.atan2(relStartVec.x, relStartVec.z); double startAngleToCenterMod = startAngleToCenter < 0 ? startAngleToCenter + Math.PI : startAngleToCenter; double startAngleInSlice = startAngleToCenterMod % sliceAngle; @@ -89,7 +89,7 @@ public class RadialMirror { curAngle = curAngle - startAngleInSlice + (sliceAngle - startAngleInSlice); } - Vector3d relNewVec = relStartVec.yRot((float) curAngle); + Vec3 relNewVec = relStartVec.yRot((float) curAngle); BlockPos newBlockPos = new BlockPos(r.position.add(relNewVec)); if (coordinates.contains(newBlockPos) || newBlockPos.equals(startPos)) continue; //filter out duplicates coordinates.add(newBlockPos); @@ -98,7 +98,7 @@ public class RadialMirror { if (bagInventory != null) { itemStack = ItemRandomizerBag.pickRandomStack(bagInventory); newBlockState = BuildModifiers - .getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vector3d(0, 0, 0), Hand.MAIN_HAND); + .getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vec3(0, 0, 0), InteractionHand.MAIN_HAND); newBlockState = rotateOriginalBlockState(startAngleToCenter, newBlockState); } @@ -127,9 +127,9 @@ public class RadialMirror { return newBlockState; } - private static BlockState rotateBlockState(Vector3d relVec, BlockState blockState, boolean alternate) { + private static BlockState rotateBlockState(Vec3 relVec, BlockState blockState, boolean alternate) { BlockState newBlockState; - double angleToCenter = MathHelper.atan2(relVec.x, relVec.z); //between -PI and PI + double angleToCenter = Mth.atan2(relVec.x, relVec.z); //between -PI and PI if (angleToCenter < -0.751 * Math.PI || angleToCenter > 0.749 * Math.PI) { newBlockState = blockState.rotate(Rotation.CLOCKWISE_180); @@ -159,13 +159,13 @@ public class RadialMirror { public static boolean isEnabled(RadialMirrorSettings r, BlockPos startPos) { if (r == null || !r.enabled) return false; - return !(new Vector3d(startPos.getX() + 0.5, startPos.getY() + 0.5, startPos.getZ() + 0.5).subtract(r.position).lengthSqr() > + return !(new Vec3(startPos.getX() + 0.5, startPos.getY() + 0.5, startPos.getZ() + 0.5).subtract(r.position).lengthSqr() > r.radius * r.radius); } public static class RadialMirrorSettings { public boolean enabled = false; - public Vector3d position = new Vector3d(0.5, 64.5, 0.5); + public Vec3 position = new Vec3(0.5, 64.5, 0.5); public int slices = 4; public boolean alternate = false; public int radius = 20; @@ -174,7 +174,7 @@ public class RadialMirror { public RadialMirrorSettings() { } - public RadialMirrorSettings(boolean enabled, Vector3d position, int slices, boolean alternate, int radius, boolean drawLines, boolean drawPlanes) { + public RadialMirrorSettings(boolean enabled, Vec3 position, int slices, boolean alternate, int radius, boolean drawLines, boolean drawPlanes) { this.enabled = enabled; this.position = position; this.slices = slices; diff --git a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/UndoRedo.java b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/UndoRedo.java index e6a58ea..8d0152c 100644 --- a/src/main/java/nl/requios/effortlessbuilding/buildmodifier/UndoRedo.java +++ b/src/main/java/nl/requios/effortlessbuilding/buildmodifier/UndoRedo.java @@ -1,15 +1,15 @@ package nl.requios.effortlessbuilding.buildmodifier; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.block.Blocks; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.server.ServerWorld; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; +import net.minecraft.server.level.ServerLevel; import nl.requios.effortlessbuilding.BuildConfig; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.helper.FixedStack; @@ -29,7 +29,7 @@ public class UndoRedo { private static final Map> redoStacksServer = new HashMap<>(); //add to undo stack - public static void addUndo(PlayerEntity player, BlockSet blockSet) { + public static void addUndo(Player player, BlockSet blockSet) { Map> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer; //Assert coordinates is as long as previous and new blockstate lists @@ -56,7 +56,7 @@ public class UndoRedo { undoStacks.get(player.getUUID()).push(blockSet); } - private static void addRedo(PlayerEntity player, BlockSet blockSet) { + private static void addRedo(Player player, BlockSet blockSet) { Map> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer; //(No asserts necessary, it's private) @@ -69,7 +69,7 @@ public class UndoRedo { redoStacks.get(player.getUUID()).push(blockSet); } - public static boolean undo(PlayerEntity player) { + public static boolean undo(Player player) { Map> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer; if (!undoStacks.containsKey(player.getUUID())) return false; @@ -82,7 +82,7 @@ public class UndoRedo { List coordinates = blockSet.getCoordinates(); List previousBlockStates = blockSet.getPreviousBlockStates(); List newBlockStates = blockSet.getNewBlockStates(); - Vector3d hitVec = blockSet.getHitVec(); + Vec3 hitVec = blockSet.getHitVec(); //Find up to date itemstacks in player inventory List itemStacks = findItemStacksInInventory(player, previousBlockStates); @@ -129,7 +129,7 @@ public class UndoRedo { return true; } - public static boolean redo(PlayerEntity player) { + public static boolean redo(Player player) { Map> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer; if (!redoStacks.containsKey(player.getUUID())) return false; @@ -142,7 +142,7 @@ public class UndoRedo { List coordinates = blockSet.getCoordinates(); List previousBlockStates = blockSet.getPreviousBlockStates(); List newBlockStates = blockSet.getNewBlockStates(); - Vector3d hitVec = blockSet.getHitVec(); + Vec3 hitVec = blockSet.getHitVec(); //Find up to date itemstacks in player inventory List itemStacks = findItemStacksInInventory(player, newBlockStates); @@ -188,7 +188,7 @@ public class UndoRedo { return true; } - public static void clear(PlayerEntity player) { + public static void clear(Player player) { Map> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer; Map> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer; if (undoStacks.containsKey(player.getUUID())) { @@ -199,7 +199,7 @@ public class UndoRedo { } } - private static List findItemStacksInInventory(PlayerEntity player, List blockStates) { + private static List findItemStacksInInventory(Player player, List blockStates) { List itemStacks = new ArrayList<>(blockStates.size()); for (BlockState blockState : blockStates) { itemStacks.add(findItemStackInInventory(player, blockState)); @@ -207,7 +207,7 @@ public class UndoRedo { return itemStacks; } - private static ItemStack findItemStackInInventory(PlayerEntity player, BlockState blockState) { + private static ItemStack findItemStackInInventory(Player player, BlockState blockState) { ItemStack itemStack = ItemStack.EMPTY; if (blockState == null) return itemStack; @@ -221,7 +221,7 @@ public class UndoRedo { if (itemStack.isEmpty()) { //Cannot check drops on clientside because loot tables are server only if (!player.level.isClientSide) { - List itemsDropped = Block.getDrops(blockState, (ServerWorld) player.level, BlockPos.ZERO, null); + List itemsDropped = Block.getDrops(blockState, (ServerLevel) player.level, BlockPos.ZERO, null); for (ItemStack itemStackDropped : itemsDropped) { if (itemStackDropped.getItem() instanceof BlockItem) { Block block = ((BlockItem) itemStackDropped.getItem()).getBlock(); diff --git a/src/main/java/nl/requios/effortlessbuilding/capability/ItemHandlerCapabilityProvider.java b/src/main/java/nl/requios/effortlessbuilding/capability/ItemHandlerCapabilityProvider.java index 875f6c1..44c7299 100644 --- a/src/main/java/nl/requios/effortlessbuilding/capability/ItemHandlerCapabilityProvider.java +++ b/src/main/java/nl/requios/effortlessbuilding/capability/ItemHandlerCapabilityProvider.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.capability; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.Direction; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.core.Direction; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.ICapabilitySerializable; import net.minecraftforge.common.util.LazyOptional; @@ -13,7 +13,7 @@ import nl.requios.effortlessbuilding.item.ItemRandomizerBag; import javax.annotation.Nonnull; import javax.annotation.Nullable; -public class ItemHandlerCapabilityProvider implements ICapabilitySerializable { +public class ItemHandlerCapabilityProvider implements ICapabilitySerializable { IItemHandler itemHandler = new ItemStackHandler(ItemRandomizerBag.INV_SIZE); @Nonnull @@ -23,12 +23,12 @@ public class ItemHandlerCapabilityProvider implements ICapabilitySerializable { @Override - public INBT writeNBT(Capability capability, IModeCapability instance, Direction side) { - CompoundNBT compound = new CompoundNBT(); + public Tag writeNBT(Capability capability, IModeCapability instance, Direction side) { + CompoundTag compound = new CompoundTag(); ModeSettings modeSettings = instance.getModeData(); if (modeSettings == null) modeSettings = new ModeSettings(); @@ -70,8 +70,8 @@ public class ModeCapabilityManager { } @Override - public void readNBT(Capability capability, IModeCapability instance, Direction side, INBT nbt) { - CompoundNBT compound = (CompoundNBT) nbt; + public void readNBT(Capability capability, IModeCapability instance, Direction side, Tag nbt) { + CompoundTag compound = (CompoundTag) nbt; //BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[compound.getInteger("buildMode")]; @@ -82,7 +82,7 @@ public class ModeCapabilityManager { } } - public static class Provider implements ICapabilitySerializable { + public static class Provider implements ICapabilitySerializable { IModeCapability inst = modeCapability.getDefaultInstance(); @Nonnull @@ -92,12 +92,12 @@ public class ModeCapabilityManager { } @Override - public INBT serializeNBT() { + public Tag serializeNBT() { return modeCapability.getStorage().writeNBT(modeCapability, inst, null); } @Override - public void deserializeNBT(INBT nbt) { + public void deserializeNBT(Tag nbt) { modeCapability.getStorage().readNBT(modeCapability, inst, null, nbt); } diff --git a/src/main/java/nl/requios/effortlessbuilding/capability/ModifierCapabilityManager.java b/src/main/java/nl/requios/effortlessbuilding/capability/ModifierCapabilityManager.java index dff6072..8ab18d0 100644 --- a/src/main/java/nl/requios/effortlessbuilding/capability/ModifierCapabilityManager.java +++ b/src/main/java/nl/requios/effortlessbuilding/capability/ModifierCapabilityManager.java @@ -1,10 +1,10 @@ package nl.requios.effortlessbuilding.capability; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.nbt.INBT; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.nbt.Tag; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.common.capabilities.Capability; import net.minecraftforge.common.capabilities.CapabilityInject; import net.minecraftforge.common.capabilities.ICapabilitySerializable; @@ -61,8 +61,8 @@ public class ModifierCapabilityManager { public static class Storage implements Capability.IStorage { @Override - public INBT writeNBT(Capability capability, IModifierCapability instance, Direction side) { - CompoundNBT compound = new CompoundNBT(); + public Tag writeNBT(Capability capability, IModifierCapability instance, Direction side) { + CompoundTag compound = new CompoundTag(); ModifierSettings modifierSettings = instance.getModifierData(); if (modifierSettings == null) modifierSettings = new ModifierSettings(); @@ -110,12 +110,12 @@ public class ModifierCapabilityManager { } @Override - public void readNBT(Capability capability, IModifierCapability instance, Direction side, INBT nbt) { - CompoundNBT compound = (CompoundNBT) nbt; + public void readNBT(Capability capability, IModifierCapability instance, Direction side, Tag nbt) { + CompoundTag compound = (CompoundTag) nbt; //MIRROR boolean mirrorEnabled = compound.getBoolean("mirrorEnabled"); - Vector3d mirrorPosition = new Vector3d( + Vec3 mirrorPosition = new Vec3( compound.getDouble("mirrorPosX"), compound.getDouble("mirrorPosY"), compound.getDouble("mirrorPosZ")); @@ -142,7 +142,7 @@ public class ModifierCapabilityManager { //RADIAL MIRROR boolean radialMirrorEnabled = compound.getBoolean("radialMirrorEnabled"); - Vector3d radialMirrorPosition = new Vector3d( + Vec3 radialMirrorPosition = new Vec3( compound.getDouble("radialMirrorPosX"), compound.getDouble("radialMirrorPosY"), compound.getDouble("radialMirrorPosZ")); @@ -159,7 +159,7 @@ public class ModifierCapabilityManager { } } - public static class Provider implements ICapabilitySerializable { + public static class Provider implements ICapabilitySerializable { IModifierCapability inst = modifierCapability.getDefaultInstance(); @@ -170,12 +170,12 @@ public class ModifierCapabilityManager { } @Override - public INBT serializeNBT() { + public Tag serializeNBT() { return modifierCapability.getStorage().writeNBT(modifierCapability, inst, null); } @Override - public void deserializeNBT(INBT nbt) { + public void deserializeNBT(Tag nbt) { modifierCapability.getStorage().readNBT(modifierCapability, inst, null, nbt); } diff --git a/src/main/java/nl/requios/effortlessbuilding/command/CommandReach.java b/src/main/java/nl/requios/effortlessbuilding/command/CommandReach.java index 08aa649..8e6fb55 100644 --- a/src/main/java/nl/requios/effortlessbuilding/command/CommandReach.java +++ b/src/main/java/nl/requios/effortlessbuilding/command/CommandReach.java @@ -2,10 +2,10 @@ package nl.requios.effortlessbuilding.command; import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.arguments.IntegerArgumentType; -import net.minecraft.command.CommandSource; -import net.minecraft.command.Commands; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.util.text.StringTextComponent; +import net.minecraft.commands.CommandSourceStack; +import net.minecraft.commands.Commands; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.network.chat.TextComponent; import net.minecraftforge.fml.network.PacketDistributor; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager; @@ -14,7 +14,7 @@ import nl.requios.effortlessbuilding.network.PacketHandler; public class CommandReach { - public static void register(CommandDispatcher dispatcher) { + public static void register(CommandDispatcher dispatcher) { dispatcher.register(Commands.literal("reach").then(Commands.literal("set").then(Commands.argument("level", IntegerArgumentType.integer(0, 3)).executes((context) -> { return setReachLevel(context.getSource().getPlayerOrException(), IntegerArgumentType.getInteger(context, "level")); }))).then(Commands.literal("get").executes((context -> { @@ -22,19 +22,19 @@ public class CommandReach { })))); } - private static int setReachLevel(ServerPlayerEntity player, int level) { + private static int setReachLevel(ServerPlayer player, int level) { ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); modifierSettings.setReachUpgrade(level); ModifierSettingsManager.setModifierSettings(player, modifierSettings); //Send to client PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new ModifierSettingsMessage(modifierSettings)); - player.sendMessage(new StringTextComponent("Reach level of " + player.getName().getString() + " set to " + modifierSettings.getReachUpgrade()), player.getUUID()); + player.sendMessage(new TextComponent("Reach level of " + player.getName().getString() + " set to " + modifierSettings.getReachUpgrade()), player.getUUID()); return 1; } - private static int getReachLevel(ServerPlayerEntity player) { + private static int getReachLevel(ServerPlayer player) { int reachUpgrade = ModifierSettingsManager.getModifierSettings(player).getReachUpgrade(); EffortlessBuilding.log(player, "Current reach: level " + reachUpgrade); diff --git a/src/main/java/nl/requios/effortlessbuilding/compatibility/CompatHelper.java b/src/main/java/nl/requios/effortlessbuilding/compatibility/CompatHelper.java index 775aa68..b8cc384 100644 --- a/src/main/java/nl/requios/effortlessbuilding/compatibility/CompatHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/compatibility/CompatHelper.java @@ -1,10 +1,10 @@ package nl.requios.effortlessbuilding.compatibility; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; import net.minecraftforge.common.util.LazyOptional; import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; @@ -97,7 +97,7 @@ public class CompatHelper { // Handle IItemHandler slot stacks not being modifiable. We must call IItemHandler#extractItem, // because the ItemStack returned by IItemHandler#getStackInSlot isn't modifiable. - public static void shrinkStack(ItemStack origStack, ItemStack curStack, PlayerEntity player) { + public static void shrinkStack(ItemStack origStack, ItemStack curStack, Player player) { //TODO 1.13 compatibility, offhand support //Hacky way to get the origstack, because given origStack is itemblock stack and never proxy // origStack = player.getHeldItem(EnumHand.MAIN_HAND); diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagContainer.java b/src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagContainer.java index 984d3bd..ce4e944 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagContainer.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagContainer.java @@ -1,42 +1,42 @@ package nl.requios.effortlessbuilding.gui; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.inventory.container.ClickType; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.ContainerType; -import net.minecraft.inventory.container.Slot; -import net.minecraft.item.ItemStack; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.Hand; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.world.inventory.ClickType; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.inventory.MenuType; +import net.minecraft.world.inventory.Slot; +import net.minecraft.world.item.ItemStack; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.InteractionHand; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.ItemStackHandler; import net.minecraftforge.items.SlotItemHandler; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.item.ItemRandomizerBag; -public class RandomizerBagContainer extends Container { +public class RandomizerBagContainer extends AbstractContainerMenu { private static final int INV_START = ItemRandomizerBag.INV_SIZE, INV_END = INV_START + 26, HOTBAR_START = INV_END + 1, HOTBAR_END = HOTBAR_START + 8; private final IItemHandler bagInventory; - public RandomizerBagContainer(ContainerType type, int id){ + public RandomizerBagContainer(MenuType type, int id){ super(type, id); bagInventory = null; } //Client - public RandomizerBagContainer(int id, PlayerInventory playerInventory, PacketBuffer packetBuffer) { + public RandomizerBagContainer(int id, Inventory playerInventory, FriendlyByteBuf packetBuffer) { this(id, playerInventory); } //Server? - public RandomizerBagContainer(int containerId, PlayerInventory playerInventory) { + public RandomizerBagContainer(int containerId, Inventory playerInventory) { this(containerId, playerInventory, new ItemStackHandler(ItemRandomizerBag.INV_SIZE)); } - public RandomizerBagContainer(int containerId, PlayerInventory playerInventory, IItemHandler inventory) { + public RandomizerBagContainer(int containerId, Inventory playerInventory, IItemHandler inventory) { super(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER.get(), containerId); bagInventory = inventory; @@ -59,7 +59,7 @@ public class RandomizerBagContainer extends Container { } @Override - public boolean stillValid(PlayerEntity playerIn) { + public boolean stillValid(Player playerIn) { return true; } @@ -71,7 +71,7 @@ public class RandomizerBagContainer extends Container { } @Override - public ItemStack quickMoveStack(PlayerEntity playerIn, int slotIndex) { + public ItemStack quickMoveStack(Player playerIn, int slotIndex) { ItemStack itemstack = ItemStack.EMPTY; Slot slot = this.slots.get(slotIndex); @@ -124,9 +124,9 @@ public class RandomizerBagContainer extends Container { * be able to save properly */ @Override - public ItemStack clicked(int slot, int dragType, ClickType clickTypeIn, PlayerEntity player) { + public ItemStack clicked(int slot, int dragType, ClickType clickTypeIn, Player player) { // this will prevent the player from interacting with the item that opened the inventory: - if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getItem().equals(player.getItemInHand(Hand.MAIN_HAND))) { + if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getItem().equals(player.getItemInHand(InteractionHand.MAIN_HAND))) { return ItemStack.EMPTY; } return super.clicked(slot, dragType, clickTypeIn, player); @@ -136,7 +136,7 @@ public class RandomizerBagContainer extends Container { * Callback for when the crafting gui is closed. */ @Override - public void removed(PlayerEntity player) { + public void removed(Player player) { super.removed(player); if (!player.level.isClientSide) { broadcastChanges(); diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagScreen.java b/src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagScreen.java index 31b8cbb..68b8ea8 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagScreen.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagScreen.java @@ -1,11 +1,11 @@ package nl.requios.effortlessbuilding.gui; -import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.systems.RenderSystem; -import net.minecraft.client.gui.screen.inventory.ContainerScreen; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; +import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.network.chat.Component; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -14,30 +14,30 @@ import javax.annotation.ParametersAreNonnullByDefault; @OnlyIn(Dist.CLIENT) @ParametersAreNonnullByDefault -public class RandomizerBagScreen extends ContainerScreen { +public class RandomizerBagScreen extends AbstractContainerScreen { private static final ResourceLocation guiTextures = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/container/randomizerbag.png"); - public RandomizerBagScreen(RandomizerBagContainer randomizerBagContainer, PlayerInventory playerInventory, ITextComponent title) { + public RandomizerBagScreen(RandomizerBagContainer randomizerBagContainer, Inventory playerInventory, Component title) { super(randomizerBagContainer, playerInventory, title);//new TranslationTextComponent("effortlessbuilding.screen.randomizer_bag")); imageHeight = 134; } @Override - public void render(MatrixStack ms, int mouseX, int mouseY, float partialTicks) { + public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) { renderBackground(ms); super.render(ms, mouseX, mouseY, partialTicks); this.renderTooltip(ms, mouseX, mouseY); } @Override - protected void renderLabels(MatrixStack ms, int mouseX, int mouseY) { + protected void renderLabels(PoseStack ms, int mouseX, int mouseY) { font.drawShadow(ms, this.title, 8, 6, 0x404040); font.drawShadow(ms, inventory.getDisplayName(), 8, imageHeight - 96 + 2, 0x404040); } @Override - protected void renderBg(MatrixStack ms, float partialTicks, int mouseX, int mouseY) { + protected void renderBg(PoseStack ms, float partialTicks, int mouseX, int mouseY) { RenderSystem.color3f(1.0F, 1.0F, 1.0F); minecraft.getTextureManager().bind(guiTextures); int marginHorizontal = (width - imageWidth) / 2; 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 dc7caf2..e9ba654 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/PlayerSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/PlayerSettingsGui.java @@ -1,22 +1,22 @@ package nl.requios.effortlessbuilding.gui.buildmode; -import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import mcp.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.SimpleSound; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.client.gui.widget.list.ExtendedList; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; +import net.minecraft.client.resources.sounds.SimpleSoundInstance; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.components.Button; +import net.minecraft.client.gui.components.ObjectSelectionList; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +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.fml.client.gui.widget.ExtendedButton; @@ -36,7 +36,7 @@ public class PlayerSettingsGui extends Screen { private Button closeButton; public PlayerSettingsGui() { - super(new TranslationTextComponent("effortlessbuilding.screen.player_settings")); + super(new TranslatableComponent("effortlessbuilding.screen.player_settings")); } @Override @@ -50,19 +50,19 @@ public class PlayerSettingsGui extends Screen { shaderTypeList = new ShaderTypeList(this.minecraft); this.children.add(shaderTypeList); //TODO set selected name - ITextComponent currentShaderName = ShaderType.DISSOLVE_BLUE.name; + Component currentShaderName = ShaderType.DISSOLVE_BLUE.name; shaderTypeButton = new ExtendedButton(right - 180, yy, 180, 20, currentShaderName, (button) -> { showShaderList = !showShaderList; }); addButton(shaderTypeButton); yy += 50; - Slider slider = new Slider(right - 200, yy, 200, 20, StringTextComponent.EMPTY, StringTextComponent.EMPTY, 0.5, 2.0, 1.0, true, true, (button) -> { + Slider slider = new Slider(right - 200, yy, 200, 20, TextComponent.EMPTY, TextComponent.EMPTY, 0.5, 2.0, 1.0, true, true, (button) -> { }); addButton(slider); - closeButton = new ExtendedButton(left + 50, bottom - 20, 180, 20, new StringTextComponent("Done"), (button) -> this.minecraft.player.closeContainer()); + closeButton = new ExtendedButton(left + 50, bottom - 20, 180, 20, new TextComponent("Done"), (button) -> this.minecraft.player.closeContainer()); addButton(closeButton); } @@ -72,7 +72,7 @@ public class PlayerSettingsGui extends Screen { } @Override - public void render(MatrixStack ms, int mouseX, int mouseY, float partialTicks) { + public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) { this.renderBackground(ms); int yy = top; @@ -107,20 +107,20 @@ public class PlayerSettingsGui extends Screen { DISSOLVE_BLUE("Dissolve Blue"), DISSOLVE_ORANGE("Dissolve Orange"); - public ITextComponent name; + public Component name; - ShaderType(ITextComponent name) { + ShaderType(Component name) { this.name = name; } ShaderType(String name) { - this.name = new StringTextComponent(name); + this.name = new TextComponent(name); } } //Inspired by LanguageScreen @OnlyIn(Dist.CLIENT) - class ShaderTypeList extends ExtendedList { + class ShaderTypeList extends ObjectSelectionList { public ShaderTypeList(Minecraft mcIn) { super(mcIn, 180, 140, top + 20, top + 100, 18); @@ -149,7 +149,7 @@ public class PlayerSettingsGui extends Screen { @Override public void setSelected(PlayerSettingsGui.ShaderTypeList.ShaderTypeEntry selected) { super.setSelected(selected); - Minecraft.getInstance().getSoundManager().play(SimpleSound.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F)); + Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F)); EffortlessBuilding.log("Selected shader " + selected.shaderType.name); shaderTypeButton.setMessage(selected.shaderType.name); // showShaderList = false; @@ -196,18 +196,18 @@ public class PlayerSettingsGui extends Screen { //From AbstractList, disabled parts @Override - public void render(MatrixStack ms, int p_render_1_, int p_render_2_, float p_render_3_) { + public void render(PoseStack ms, int p_render_1_, int p_render_2_, float p_render_3_) { this.renderBackground(ms); int i = this.getScrollbarPosition(); int j = i + 6; - Tessellator tessellator = Tessellator.getInstance(); + Tesselator tessellator = Tesselator.getInstance(); BufferBuilder bufferbuilder = tessellator.getBuilder(); // this.minecraft.getTextureManager().bindTexture(AbstractGui.BACKGROUND_LOCATION); RenderSystem.enableBlend(); RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE); RenderSystem.color4f(1.0F, 1.0F, 1.0F, 1.0F); float f = 32.0F; - bufferbuilder.begin(7, DefaultVertexFormats.POSITION_COLOR); + bufferbuilder.begin(7, DefaultVertexFormat.POSITION_COLOR); bufferbuilder.vertex(this.x0, this.y1, 0.0D).color(20, 20, 20, 180).endVertex(); bufferbuilder.vertex(this.x1, this.y1, 0.0D).color(20, 20, 20, 180).endVertex(); bufferbuilder.vertex(this.x1, this.y0, 0.0D).color(20, 20, 20, 180).endVertex(); @@ -246,25 +246,25 @@ public class PlayerSettingsGui extends Screen { int j1 = this.getMaxScroll(); if (j1 > 0) { int k1 = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) / (float) this.getMaxPosition()); - k1 = MathHelper.clamp(k1, 32, this.y1 - this.y0 - 8); + k1 = Mth.clamp(k1, 32, this.y1 - this.y0 - 8); int l1 = (int) this.getScrollAmount() * (this.y1 - this.y0 - k1) / j1 + this.y0; if (l1 < this.y0) { l1 = this.y0; } - bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + bufferbuilder.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR); bufferbuilder.vertex(i, this.y1, 0.0D).uv(0.0F, 1.0F).color(0, 0, 0, 255).endVertex(); bufferbuilder.vertex(j, this.y1, 0.0D).uv(1.0F, 1.0F).color(0, 0, 0, 255).endVertex(); bufferbuilder.vertex(j, this.y0, 0.0D).uv(1.0F, 0.0F).color(0, 0, 0, 255).endVertex(); bufferbuilder.vertex(i, this.y0, 0.0D).uv(0.0F, 0.0F).color(0, 0, 0, 255).endVertex(); tessellator.end(); - bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + bufferbuilder.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR); bufferbuilder.vertex(i, l1 + k1, 0.0D).uv(0.0F, 1.0F).color(128, 128, 128, 255).endVertex(); bufferbuilder.vertex(j, l1 + k1, 0.0D).uv(1.0F, 1.0F).color(128, 128, 128, 255).endVertex(); bufferbuilder.vertex(j, l1, 0.0D).uv(1.0F, 0.0F).color(128, 128, 128, 255).endVertex(); bufferbuilder.vertex(i, l1, 0.0D).uv(0.0F, 0.0F).color(128, 128, 128, 255).endVertex(); tessellator.end(); - bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + bufferbuilder.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR); bufferbuilder.vertex(i, l1 + k1 - 1, 0.0D).uv(0.0F, 1.0F).color(192, 192, 192, 255).endVertex(); bufferbuilder.vertex(j - 1, l1 + k1 - 1, 0.0D).uv(1.0F, 1.0F).color(192, 192, 192, 255).endVertex(); bufferbuilder.vertex(j - 1, l1, 0.0D).uv(1.0F, 0.0F).color(192, 192, 192, 255).endVertex(); @@ -284,7 +284,7 @@ public class PlayerSettingsGui extends Screen { } @OnlyIn(Dist.CLIENT) - public class ShaderTypeEntry extends ExtendedList.AbstractListEntry { + public class ShaderTypeEntry extends ObjectSelectionList.Entry { private final ShaderType shaderType; public ShaderTypeEntry(ShaderType shaderType) { @@ -292,7 +292,7 @@ public class PlayerSettingsGui extends Screen { } @Override - public void render(MatrixStack ms, int itemIndex, int rowTop, int rowLeft, int rowWidth, int rowHeight, int mouseX, int mouseY, boolean hovered, float partialTicks) { + public void render(PoseStack ms, int itemIndex, int rowTop, int rowLeft, int rowWidth, int rowHeight, int mouseX, int mouseY, boolean hovered, float partialTicks) { if (rowTop + 10 > ShaderTypeList.this.y0 && rowTop + rowHeight - 5 < ShaderTypeList.this.y1) drawString(ms, font, shaderType.name, ShaderTypeList.this.x0 + 8, rowTop + 4, 0xFFFFFF); } 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 3af11d2..006d147 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java @@ -1,21 +1,21 @@ package nl.requios.effortlessbuilding.gui.buildmode; import com.google.common.base.Stopwatch; -import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.systems.RenderSystem; import mcp.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.texture.AtlasTexture; +import net.minecraft.client.gui.screens.Screen; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.Tesselator; +import net.minecraft.client.renderer.texture.TextureAtlas; import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.client.resources.I18n; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.util.Direction; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import net.minecraft.client.resources.language.I18n; +import net.minecraft.client.KeyMapping; +import net.minecraft.core.Direction; +import net.minecraft.ChatFormatting; +import net.minecraft.network.chat.TranslatableComponent; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.ModClientEventHandler; import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager; @@ -52,7 +52,7 @@ public class RadialMenu extends Screen { private Stopwatch lastChange = Stopwatch.createStarted(); public RadialMenu() { - super(new TranslationTextComponent("effortlessbuilding.screen.radial_menu")); + super(new TranslatableComponent("effortlessbuilding.screen.radial_menu")); } private float clampVis(final float f) { @@ -85,7 +85,7 @@ public class RadialMenu extends Screen { } @Override - public void render(MatrixStack ms, final int mouseX, final int mouseY, final float partialTicks) { + public void render(PoseStack ms, final int mouseX, final int mouseY, final float partialTicks) { if (!isVisible()) return; BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(Minecraft.getInstance().player).getBuildMode(); @@ -103,10 +103,10 @@ public class RadialMenu extends Screen { RenderSystem.disableAlphaTest(); RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0); RenderSystem.shadeModel(GL11.GL_SMOOTH); - final Tessellator tessellator = Tessellator.getInstance(); + final Tesselator tessellator = Tesselator.getInstance(); final BufferBuilder buffer = tessellator.getBuilder(); - buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR); + buffer.begin(GL11.GL_QUADS, DefaultVertexFormat.POSITION_COLOR); final double middleX = width / 2.0; final double middleY = height / 2.0; @@ -268,9 +268,9 @@ public class RadialMenu extends Screen { RenderSystem.color3f(1f, 1f, 1f); RenderSystem.disableBlend(); RenderSystem.enableAlphaTest(); - mc.getTextureManager().bind(AtlasTexture.LOCATION_BLOCKS); + mc.getTextureManager().bind(TextureAtlas.LOCATION_BLOCKS); - buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); + buffer.begin(GL11.GL_QUADS, DefaultVertexFormat.POSITION_TEX_COLOR); //Draw buildmode icons for (final MenuRegion menuRegion : modes) { @@ -363,7 +363,7 @@ public class RadialMenu extends Screen { //Draw action text for (final MenuButton button : buttons) { if (button.highlighted) { - String text = TextFormatting.AQUA + button.name; + String text = ChatFormatting.AQUA + button.name; int wrap = 120; String keybind = ""; // FIXME String keybindFormatted = ""; @@ -390,7 +390,7 @@ public class RadialMenu extends Screen { } } if (!keybind.isEmpty()) - keybindFormatted = TextFormatting.GRAY + "(" + WordUtils.capitalizeFully(keybind) + ")"; + keybindFormatted = ChatFormatting.GRAY + "(" + WordUtils.capitalizeFully(keybind) + ")"; if (button.textSide == Direction.WEST) { @@ -445,8 +445,8 @@ public class RadialMenu extends Screen { public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) { EffortlessBuilding.log("mouse clicked"); - KeyBinding.setAll(); - KeyBinding.set(ClientProxy.keyBindings[3].getKey(), true); + KeyMapping.setAll(); + KeyMapping.set(ClientProxy.keyBindings[3].getKey(), true); if (mouseButton == 0) { this.minecraft.setScreen(null); 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 24672f1..9efd249 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArraySettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArraySettingsGui.java @@ -1,11 +1,11 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; -import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.Widget; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; +import com.mojang.blaze3d.vertex.PoseStack; +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.ChatFormatting; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -33,7 +33,7 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry { } @Override - public void init(List buttons) { + public void init(List buttons) { super.init(buttons); int y = top; @@ -49,23 +49,23 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry { y = top + 20; textArrayOffsetX = new GuiNumberField(font, buttons, left + 70, y, 50, 18); textArrayOffsetX.setNumber(0); - textArrayOffsetX.setTooltip(new StringTextComponent("How much each copy is shifted.")); + textArrayOffsetX.setTooltip(new TextComponent("How much each copy is shifted.")); arrayNumberFieldList.add(textArrayOffsetX); textArrayOffsetY = new GuiNumberField(font, buttons, left + 140, y, 50, 18); textArrayOffsetY.setNumber(0); - textArrayOffsetY.setTooltip(new StringTextComponent("How much each copy is shifted.")); + textArrayOffsetY.setTooltip(new TextComponent("How much each copy is shifted.")); arrayNumberFieldList.add(textArrayOffsetY); textArrayOffsetZ = new GuiNumberField(font, buttons, left + 210, y, 50, 18); textArrayOffsetZ.setNumber(0); - textArrayOffsetZ.setTooltip(new StringTextComponent("How much each copy is shifted.")); + textArrayOffsetZ.setTooltip(new TextComponent("How much each copy is shifted.")); arrayNumberFieldList.add(textArrayOffsetZ); y = top + 50; textArrayCount = new GuiNumberField(font, buttons, left + 55, y, 50, 18); textArrayCount.setNumber(5); - textArrayCount.setTooltip(new StringTextComponent("How many copies should be made.")); + textArrayCount.setTooltip(new TextComponent("How many copies should be made.")); arrayNumberFieldList.add(textArrayCount); ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player); @@ -86,7 +86,7 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry { } @Override - public void drawEntry(MatrixStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, + public void drawEntry(PoseStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks) { int yy = y; int offset = 8; @@ -111,8 +111,8 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry { int currentReach = Math.max(-1, getArrayReach()); int maxReach = ReachHelper.getMaxReach(mc.player); - TextFormatting reachColor = isCurrentReachValid(currentReach, maxReach) ? TextFormatting.GRAY : TextFormatting.RED; - String reachText = "Reach: " + reachColor + currentReach + TextFormatting.GRAY + "/" + TextFormatting.GRAY + maxReach; + ChatFormatting reachColor = isCurrentReachValid(currentReach, maxReach) ? ChatFormatting.GRAY : ChatFormatting.RED; + String reachText = "Reach: " + reachColor + currentReach + ChatFormatting.GRAY + "/" + ChatFormatting.GRAY + maxReach; font.draw(ms, reachText, left + 176 + offset, yy + 5, 0xFFFFFF); arrayNumberFieldList.forEach(numberField -> numberField.drawNumberField(ms, mouseX, mouseY, partialTicks)); @@ -123,7 +123,7 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry { } - public void drawTooltip(MatrixStack ms, Screen guiScreen, int mouseX, int mouseY) { + public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) { //Draw tooltips last if (buttonArrayEnabled.isChecked()) { arrayNumberFieldList.forEach(numberField -> numberField.drawTooltip(ms, scrollPane.parent, mouseX, mouseY)); 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 e7df163..e0c4117 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorSettingsGui.java @@ -1,13 +1,13 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; -import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.Widget; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.Button; +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; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -40,7 +40,7 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry { } @Override - public void init(List buttonList) { + public void init(List buttonList) { super.init(buttonList); int y = top - 2; @@ -57,17 +57,17 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry { textMirrorPosX = new GuiNumberField(font, buttonList, left + 58, y, 62, 18); textMirrorPosX.setNumber(0); textMirrorPosX.setTooltip( - Arrays.asList(new StringTextComponent("The position of the mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY))); + Arrays.asList(new TextComponent("The position of the mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); mirrorNumberFieldList.add(textMirrorPosX); textMirrorPosY = new GuiNumberField(font, buttonList, left + 138, y, 62, 18); textMirrorPosY.setNumber(64); - textMirrorPosY.setTooltip(Arrays.asList(new StringTextComponent("The position of the mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY))); + textMirrorPosY.setTooltip(Arrays.asList(new TextComponent("The position of the mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); mirrorNumberFieldList.add(textMirrorPosY); textMirrorPosZ = new GuiNumberField(font, buttonList, left + 218, y, 62, 18); textMirrorPosZ.setNumber(0); - textMirrorPosZ.setTooltip(Arrays.asList(new StringTextComponent("The position of the mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY))); + textMirrorPosZ.setTooltip(Arrays.asList(new TextComponent("The position of the mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); mirrorNumberFieldList.add(textMirrorPosZ); y = top + 50; @@ -84,53 +84,53 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry { textMirrorRadius = new GuiNumberField(font, buttonList, left + 218, y, 62, 18); textMirrorRadius.setNumber(50); //TODO change to diameter (remove /2) - textMirrorRadius.setTooltip(Arrays.asList(new StringTextComponent("How far the mirror reaches in any direction."), - new StringTextComponent("Max: ").withStyle(TextFormatting.GRAY).append(new StringTextComponent(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(TextFormatting.GOLD)), - new StringTextComponent("Upgradeable in survival with reach upgrades.").withStyle(TextFormatting.GRAY))); + 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))); mirrorNumberFieldList.add(textMirrorRadius); y = top + 72; buttonCurrentPosition = new GuiIconButton(left + 5, y, 0, 0, BUILDING_ICONS, button -> { - Vector3d pos = new Vector3d(Math.floor(mc.player.getX()) + 0.5, Math.floor(mc.player.getY()) + 0.5, Math.floor(mc.player.getZ()) + 0.5); + Vec3 pos = new Vec3(Math.floor(mc.player.getX()) + 0.5, Math.floor(mc.player.getY()) + 0.5, Math.floor(mc.player.getZ()) + 0.5); textMirrorPosX.setNumber(pos.x); textMirrorPosY.setNumber(pos.y); textMirrorPosZ.setNumber(pos.z); }); - buttonCurrentPosition.setTooltip(new StringTextComponent("Set mirror position to current player position")); + buttonCurrentPosition.setTooltip(new TextComponent("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 StringTextComponent("Set mirror position to corner of block"), new StringTextComponent("for even numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to corner of block"), new TextComponent("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 StringTextComponent("Set mirror position to middle of block"), new StringTextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to middle of block"), new TextComponent("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 StringTextComponent("Set mirror position to middle of block"), new StringTextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to middle of block"), new TextComponent("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 StringTextComponent(drawLines ? "Hide lines" : "Show lines")); + buttonDrawLines.setTooltip(new TextComponent(drawLines ? "Hide lines" : "Show lines")); }); - buttonDrawLines.setTooltip(new StringTextComponent("Show lines")); + buttonDrawLines.setTooltip(new TextComponent("Show lines")); mirrorIconButtonList.add(buttonDrawLines); buttonDrawPlanes = new GuiIconButton(left + 95, y, 0, 60, BUILDING_ICONS, button -> { drawPlanes = !drawPlanes; buttonDrawPlanes.setUseAlternateIcon(drawPlanes); - buttonDrawPlanes.setTooltip(new StringTextComponent(drawPlanes ? "Hide area" : "Show area")); + buttonDrawPlanes.setTooltip(new TextComponent(drawPlanes ? "Hide area" : "Show area")); }); - buttonDrawPlanes.setTooltip(new StringTextComponent("Show area")); + buttonDrawPlanes.setTooltip(new TextComponent("Show area")); mirrorIconButtonList.add(buttonDrawPlanes); ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player); @@ -148,14 +148,14 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry { drawPlanes = m.drawPlanes; buttonDrawLines.setUseAlternateIcon(drawLines); buttonDrawPlanes.setUseAlternateIcon(drawPlanes); - buttonDrawLines.setTooltip(new StringTextComponent(drawLines ? "Hide lines" : "Show lines")); - buttonDrawPlanes.setTooltip(new StringTextComponent(drawPlanes ? "Hide area" : "Show area")); + buttonDrawLines.setTooltip(new TextComponent(drawLines ? "Hide lines" : "Show lines")); + buttonDrawPlanes.setTooltip(new TextComponent(drawPlanes ? "Hide area" : "Show area")); if (textMirrorPosX.getNumber() == Math.floor(textMirrorPosX.getNumber())) { toggleOdd = false; - buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set mirror position to middle of block"), new StringTextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to middle of block"), new TextComponent("for odd numbered builds"))); } else { toggleOdd = true; - buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set mirror position to corner of block"), new StringTextComponent("for even numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to corner of block"), new TextComponent("for even numbered builds"))); } buttonToggleOdd.setUseAlternateIcon(toggleOdd); } @@ -173,7 +173,7 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry { } @Override - public void drawEntry(MatrixStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, + public void drawEntry(PoseStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks) { int yy = y; @@ -217,7 +217,7 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry { } - public void drawTooltip(MatrixStack ms, Screen guiScreen, int mouseX, int mouseY) { + public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) { //Draw tooltips last if (buttonMirrorEnabled.isChecked()) { mirrorIconButtonList.forEach(iconButton -> iconButton.drawTooltip(ms, scrollPane.parent, mouseX, mouseY)); @@ -251,9 +251,9 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry { public Mirror.MirrorSettings getMirrorSettings() { boolean mirrorEnabled = buttonMirrorEnabled.isChecked(); - Vector3d mirrorPos = new Vector3d(0, 64, 0); + Vec3 mirrorPos = new Vec3(0, 64, 0); try { - mirrorPos = new Vector3d(textMirrorPosX.getNumber(), textMirrorPosY.getNumber(), textMirrorPosZ.getNumber()); + mirrorPos = new Vec3(textMirrorPosX.getNumber(), textMirrorPosY.getNumber(), textMirrorPosZ.getNumber()); } catch (NumberFormatException | NullPointerException ex) { EffortlessBuilding.log(mc.player, "Mirror position not a valid number."); } 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 35710d0..d06f397 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java @@ -1,11 +1,11 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; -import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TranslationTextComponent; +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.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -29,7 +29,7 @@ public class ModifierSettingsGui extends Screen { private RadialMirrorSettingsGui radialMirrorSettingsGui; public ModifierSettingsGui() { - super(new TranslationTextComponent("effortlessbuilding.screen.modifier_settings")); + super(new TranslatableComponent("effortlessbuilding.screen.modifier_settings")); } @Override @@ -50,7 +50,7 @@ public class ModifierSettingsGui extends Screen { //Close button int y = height - 26; - buttonClose = new Button(width / 2 - 100, y, 200, 20, new StringTextComponent("Close"), (button) -> { + buttonClose = new Button(width / 2 - 100, y, 200, 20, new TextComponent("Close"), (button) -> { Minecraft.getInstance().player.closeContainer(); }); buttons.add(buttonClose); @@ -67,7 +67,7 @@ public class ModifierSettingsGui extends Screen { @Override //Set colors using GL11, use the fontObj field to display text //Use drawTexturedModalRect() to transfers areas of a texture resource to the screen - public void render(MatrixStack ms, int mouseX, int mouseY, float partialTicks) { + public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) { this.renderBackground(ms); scrollPane.render(ms, mouseX, mouseY, partialTicks); 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 7392fbc..46713b2 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java @@ -1,13 +1,13 @@ package nl.requios.effortlessbuilding.gui.buildmodifier; -import com.mojang.blaze3d.matrix.MatrixStack; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.Widget; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; +import com.mojang.blaze3d.vertex.PoseStack; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.components.AbstractWidget; +import net.minecraft.client.gui.components.Button; +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; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -40,7 +40,7 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry { } @Override - public void init(List buttonList) { + public void init(List buttonList) { super.init(buttonList); int y = top - 2; @@ -57,75 +57,75 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry { textRadialMirrorPosX = new GuiNumberField(font, buttonList, left + 58, y, 62, 18); textRadialMirrorPosX.setNumber(0); textRadialMirrorPosX.setTooltip( - Arrays.asList(new StringTextComponent("The position of the radial mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY))); + Arrays.asList(new TextComponent("The position of the radial mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); radialMirrorNumberFieldList.add(textRadialMirrorPosX); textRadialMirrorPosY = new GuiNumberField(font, buttonList, left + 138, y, 62, 18); textRadialMirrorPosY.setNumber(64); - textRadialMirrorPosY.setTooltip(Arrays.asList(new StringTextComponent("The position of the radial mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY))); + textRadialMirrorPosY.setTooltip(Arrays.asList(new TextComponent("The position of the radial mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); radialMirrorNumberFieldList.add(textRadialMirrorPosY); textRadialMirrorPosZ = new GuiNumberField(font, buttonList, left + 218, y, 62, 18); textRadialMirrorPosZ.setNumber(0); - textRadialMirrorPosZ.setTooltip(Arrays.asList(new StringTextComponent("The position of the radial mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY))); + textRadialMirrorPosZ.setTooltip(Arrays.asList(new TextComponent("The position of the radial mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY))); radialMirrorNumberFieldList.add(textRadialMirrorPosZ); y = top + 47; textRadialMirrorSlices = new GuiNumberField(font, buttonList, left + 55, y, 50, 18); textRadialMirrorSlices.setNumber(4); - textRadialMirrorSlices.setTooltip(Arrays.asList(new StringTextComponent("The number of repeating slices."), new StringTextComponent("Minimally 2.").withStyle(TextFormatting.GRAY))); + textRadialMirrorSlices.setTooltip(Arrays.asList(new TextComponent("The number of repeating slices."), new TextComponent("Minimally 2.").withStyle(ChatFormatting.GRAY))); radialMirrorNumberFieldList.add(textRadialMirrorSlices); textRadialMirrorRadius = new GuiNumberField(font, buttonList, left + 218, y, 62, 18); textRadialMirrorRadius.setNumber(50); //TODO change to diameter (remove /2) - textRadialMirrorRadius.setTooltip(Arrays.asList(new StringTextComponent("How far the radial mirror reaches from its center position."), - new StringTextComponent("Max: ").withStyle(TextFormatting.GRAY).append(new StringTextComponent(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(TextFormatting.GOLD)), - new StringTextComponent("Upgradeable in survival with reach upgrades.").withStyle(TextFormatting.GRAY))); + 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))); radialMirrorNumberFieldList.add(textRadialMirrorRadius); y = top + 72; buttonCurrentPosition = new GuiIconButton(left + 5, y, 0, 0, BUILDING_ICONS, button -> { - Vector3d pos = new Vector3d(Math.floor(mc.player.getX()) + 0.5, Math.floor(mc.player.getY()) + 0.5, Math.floor(mc.player.getZ()) + 0.5); + Vec3 pos = new Vec3(Math.floor(mc.player.getX()) + 0.5, Math.floor(mc.player.getY()) + 0.5, Math.floor(mc.player.getZ()) + 0.5); textRadialMirrorPosX.setNumber(pos.x); textRadialMirrorPosY.setNumber(pos.y); textRadialMirrorPosZ.setNumber(pos.z); }); - buttonCurrentPosition.setTooltip(new StringTextComponent("Set radial mirror position to current player position")); + buttonCurrentPosition.setTooltip(new TextComponent("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 StringTextComponent("Set mirror position to corner of block"), new StringTextComponent("for even numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to corner of block"), new TextComponent("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 StringTextComponent("Set mirror position to middle of block"), new StringTextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set mirror position to middle of block"), new TextComponent("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 StringTextComponent("Set radial mirror position to middle of block"), new StringTextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set radial mirror position to middle of block"), new TextComponent("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 StringTextComponent(drawLines ? "Hide lines" : "Show lines")); + buttonDrawLines.setTooltip(new TextComponent(drawLines ? "Hide lines" : "Show lines")); }); - buttonDrawLines.setTooltip(new StringTextComponent("Show lines")); + buttonDrawLines.setTooltip(new TextComponent("Show lines")); radialMirrorIconButtonList.add(buttonDrawLines); buttonDrawPlanes = new GuiIconButton(left + 95, y, 0, 60, BUILDING_ICONS, button -> { drawPlanes = !drawPlanes; buttonDrawPlanes.setUseAlternateIcon(drawPlanes); - buttonDrawPlanes.setTooltip(new StringTextComponent(drawPlanes ? "Hide area" : "Show area")); + buttonDrawPlanes.setTooltip(new TextComponent(drawPlanes ? "Hide area" : "Show area")); }); - buttonDrawPlanes.setTooltip(new StringTextComponent("Show area")); + buttonDrawPlanes.setTooltip(new TextComponent("Show area")); radialMirrorIconButtonList.add(buttonDrawPlanes); y = top + 76; @@ -146,14 +146,14 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry { drawPlanes = r.drawPlanes; buttonDrawLines.setUseAlternateIcon(drawLines); buttonDrawPlanes.setUseAlternateIcon(drawPlanes); - buttonDrawLines.setTooltip(new StringTextComponent(drawLines ? "Hide lines" : "Show lines")); - buttonDrawPlanes.setTooltip(new StringTextComponent(drawPlanes ? "Hide area" : "Show area")); + buttonDrawLines.setTooltip(new TextComponent(drawLines ? "Hide lines" : "Show lines")); + buttonDrawPlanes.setTooltip(new TextComponent(drawPlanes ? "Hide area" : "Show area")); if (textRadialMirrorPosX.getNumber() == Math.floor(textRadialMirrorPosX.getNumber())) { toggleOdd = false; - buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set radial mirror position to middle of block"), new StringTextComponent("for odd numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set radial mirror position to middle of block"), new TextComponent("for odd numbered builds"))); } else { toggleOdd = true; - buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set radial mirror position to corner of block"), new StringTextComponent("for even numbered builds"))); + buttonToggleOdd.setTooltip(Arrays.asList(new TextComponent("Set radial mirror position to corner of block"), new TextComponent("for even numbered builds"))); } buttonToggleOdd.setUseAlternateIcon(toggleOdd); } @@ -170,7 +170,7 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry { @Override - public void drawEntry(MatrixStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, + public void drawEntry(PoseStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks) { int yy = y; @@ -216,7 +216,7 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry { } - public void drawTooltip(MatrixStack ms, Screen guiScreen, int mouseX, int mouseY) { + public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) { //Draw tooltips last if (buttonRadialMirrorEnabled.isChecked()) { radialMirrorIconButtonList.forEach(iconButton -> iconButton.drawTooltip(ms, scrollPane.parent, mouseX, mouseY)); @@ -250,9 +250,9 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry { public RadialMirror.RadialMirrorSettings getRadialMirrorSettings() { boolean radialMirrorEnabled = buttonRadialMirrorEnabled.isChecked(); - Vector3d radialMirrorPos = new Vector3d(0, 64, 0); + Vec3 radialMirrorPos = new Vec3(0, 64, 0); try { - radialMirrorPos = new Vector3d(textRadialMirrorPosX.getNumber(), textRadialMirrorPosY.getNumber(), textRadialMirrorPosZ + radialMirrorPos = new Vec3(textRadialMirrorPosX.getNumber(), textRadialMirrorPosY.getNumber(), textRadialMirrorPosZ .getNumber()); } catch (NumberFormatException | NullPointerException ex) { EffortlessBuilding.log(mc.player, "Radial mirror position not a valid number."); 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 898b011..d5609c9 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java @@ -1,9 +1,9 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.util.text.StringTextComponent; +import net.minecraft.client.gui.components.Button; +import net.minecraft.network.chat.TextComponent; import net.minecraftforge.fml.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 StringTextComponent(displayString), b -> { + super(xPos, yPos, Minecraft.getInstance().font.width(displayString) + 2 + 11, 11, new TextComponent(displayString), b -> { }); this.isChecked = isChecked; this.boxWidth = 11; @@ -26,7 +26,7 @@ public class GuiCheckBoxFixed extends Button { } @Override - public void renderButton(MatrixStack ms, int mouseX, int mouseY, float partial) { + public void renderButton(PoseStack ms, int mouseX, int mouseY, float partial) { 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; diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java index 90f86d1..f1be40d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java @@ -1,10 +1,10 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.Widget; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.components.AbstractWidget; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -14,7 +14,7 @@ import java.util.List; public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScrollEntry { public GuiScrollPane scrollPane; - protected FontRenderer font; + protected Font font; protected Minecraft mc; protected boolean isCollapsed = true; @@ -27,7 +27,7 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll } @Override - public void init(List buttonList) { + public void init(List buttonList) { left = scrollPane.getWidth() / 2 - 140; right = scrollPane.getWidth() / 2 + 140; top = scrollPane.getHeight() / 2 - 100; @@ -39,7 +39,7 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll } @Override - public void drawTooltip(MatrixStack ms, Screen guiScreen, int mouseX, int mouseY) { + public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) { } @Override 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 32f36f3..a25f774 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java @@ -1,12 +1,12 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; +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; @@ -21,15 +21,15 @@ public class GuiIconButton extends Button { private final ResourceLocation resourceLocation; private final int iconX, iconY, iconWidth, iconHeight, iconAltX, iconAltY; - List tooltip = new ArrayList<>(); + List tooltip = new ArrayList<>(); private boolean useAltIcon = false; - public GuiIconButton(int x, int y, int iconX, int iconY, ResourceLocation resourceLocation, Button.IPressable onPress) { + public GuiIconButton(int x, int y, int iconX, int iconY, ResourceLocation resourceLocation, Button.OnPress onPress) { this(x, y, 20, 20, iconX, iconY, 20, 20, 20, 0, resourceLocation, onPress); } - 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.IPressable onPress) { - super(x, y, width, height, StringTextComponent.EMPTY, onPress); + 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); this.iconX = iconX; this.iconY = iconY; this.iconWidth = iconWidth; @@ -39,11 +39,11 @@ public class GuiIconButton extends Button { this.resourceLocation = resourceLocation; } - public void setTooltip(ITextComponent tooltip) { + public void setTooltip(Component tooltip) { setTooltip(Collections.singletonList(tooltip)); } - public void setTooltip(List tooltip) { + public void setTooltip(List tooltip) { this.tooltip = tooltip; } @@ -52,7 +52,7 @@ public class GuiIconButton extends Button { } @Override - public void render(MatrixStack ms, int mouseX, int mouseY, float partialTicks) { + public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) { super.render(ms, mouseX, mouseY, partialTicks); if (this.visible) { this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height; @@ -70,7 +70,7 @@ public class GuiIconButton extends Button { } } - public void drawTooltip(MatrixStack ms, Screen screen, int mouseX, int mouseY) { + public void drawTooltip(PoseStack ms, Screen screen, int mouseX, int mouseY) { boolean flag = mouseX >= x && mouseX < x + width && mouseY >= y && mouseY < y + height; if (flag) { 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 f5b47c8..f5bfec1 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java @@ -1,16 +1,16 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.PoseStack; import mcp.MethodsReturnNonnullByDefault; -import net.minecraft.client.gui.AbstractGui; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.TextFieldWidget; -import net.minecraft.client.gui.widget.Widget; -import net.minecraft.client.gui.widget.button.Button; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; +import net.minecraft.client.gui.GuiComponent; +import net.minecraft.client.gui.Font; +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; @@ -24,31 +24,31 @@ import java.util.List; @OnlyIn(Dist.CLIENT) @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault -public class GuiNumberField extends AbstractGui { +public class GuiNumberField extends GuiComponent { public int x, y, width, height; public int buttonWidth = 10; - protected TextFieldWidget textField; + protected EditBox textField; protected Button minusButton, plusButton; - List tooltip = new ArrayList<>(); + List tooltip = new ArrayList<>(); - public GuiNumberField(FontRenderer font, List buttonList, int x, int y, int width, int height) { + public GuiNumberField(Font font, List buttonList, int x, int y, int width, int height) { this.x = x; this.y = y; this.width = width; this.height = height; - textField = new TextFieldWidget(font, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2, StringTextComponent.EMPTY); - minusButton = new Button(x, y - 1, buttonWidth, height + 2, new StringTextComponent("-"), button -> { + 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 -> { 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 StringTextComponent("+"), button -> { + plusButton = new Button(x + width - buttonWidth, y - 1, buttonWidth, height + 2, new TextComponent("+"), button -> { float valueChanged = 1f; if (Screen.hasControlDown()) valueChanged = 5f; if (Screen.hasShiftDown()) valueChanged = 10f; @@ -73,11 +73,11 @@ public class GuiNumberField extends AbstractGui { textField.setValue(DecimalFormat.getInstance().format(number)); } - public void setTooltip(ITextComponent tooltip) { + public void setTooltip(Component tooltip) { setTooltip(Collections.singletonList(tooltip)); } - public void setTooltip(List tooltip) { + public void setTooltip(List tooltip) { this.tooltip = tooltip; } @@ -97,7 +97,7 @@ public class GuiNumberField extends AbstractGui { return result; } - public void drawNumberField(MatrixStack ms, int mouseX, int mouseY, float partialTicks) { + public void drawNumberField(PoseStack ms, int mouseX, int mouseY, float partialTicks) { textField.y = y + 1; minusButton.y = y - 1; plusButton.y = y - 1; @@ -107,14 +107,14 @@ public class GuiNumberField extends AbstractGui { plusButton.render(ms, mouseX, mouseY, partialTicks); } - public void drawTooltip(MatrixStack ms, Screen screen, int mouseX, int mouseY) { + public void drawTooltip(PoseStack ms, Screen screen, int mouseX, int mouseY) { boolean insideTextField = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height; boolean insideMinusButton = mouseX >= x && mouseX < x + buttonWidth && mouseY >= y && mouseY < y + height; boolean insidePlusButton = mouseX >= x + width - buttonWidth && mouseX < x + width && mouseY >= y && mouseY < y + height; // List textLines = new ArrayList<>(); - List textLines = new ArrayList<>(); + List textLines = new ArrayList<>(); if (insideTextField) { @@ -123,17 +123,17 @@ public class GuiNumberField extends AbstractGui { } if (insideMinusButton) { - textLines.add(new StringTextComponent("Hold ").append(new StringTextComponent("shift ").withStyle(TextFormatting.AQUA)).append("for ") - .append(new StringTextComponent("10").withStyle(TextFormatting.RED))); - textLines.add(new StringTextComponent("Hold ").append(new StringTextComponent("ctrl ").withStyle(TextFormatting.AQUA)).append("for ") - .append(new StringTextComponent("5").withStyle(TextFormatting.RED))); + 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))); } if (insidePlusButton) { - textLines.add(new StringTextComponent("Hold ").append(new StringTextComponent("shift ").withStyle(TextFormatting.DARK_GREEN)).append("for ") - .append(new StringTextComponent("10").withStyle(TextFormatting.RED))); - textLines.add(new StringTextComponent("Hold ").append(new StringTextComponent("ctrl ").withStyle(TextFormatting.DARK_GREEN)).append("for ") - .append(new StringTextComponent("5").withStyle(TextFormatting.RED))); + 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))); } screen.renderComponentTooltip(ms, textLines, mouseX - 10, mouseY + 25); diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java index 51b843f..9a7c0fa 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java @@ -1,18 +1,18 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.platform.GlStateManager; import com.mojang.blaze3d.systems.RenderSystem; import mcp.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FontRenderer; -import net.minecraft.client.gui.IGuiEventListener; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.widget.Widget; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.math.MathHelper; +import net.minecraft.client.gui.Font; +import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.gui.components.AbstractWidget; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import net.minecraft.util.Mth; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; @@ -27,14 +27,14 @@ import java.util.List; public class GuiScrollPane extends SlotGui { public Screen parent; - public FontRenderer font; + public Font font; private final List listEntries; private float scrollMultiplier = 1f; private int mouseX; private int mouseY; - public GuiScrollPane(Screen parent, FontRenderer font, int top, int bottom) { + public GuiScrollPane(Screen parent, Font font, int top, int bottom) { super(Minecraft.getInstance(), parent.width, parent.height, top, bottom, 100); this.parent = parent; this.font = font; @@ -74,7 +74,7 @@ public class GuiScrollPane extends SlotGui { //Removed background @Override - public void render(MatrixStack ms, int mouseXIn, int mouseYIn, float partialTicks) { + public void render(PoseStack ms, int mouseXIn, int mouseYIn, float partialTicks) { if (this.visible) { this.mouseX = mouseXIn; this.mouseY = mouseYIn; @@ -83,7 +83,7 @@ public class GuiScrollPane extends SlotGui { int scrollbarRight = scrollbarLeft + 6; this.capYPosition(); - Tessellator tessellator = Tessellator.getInstance(); + Tesselator tessellator = Tesselator.getInstance(); BufferBuilder bufferbuilder = tessellator.getBuilder(); int insideLeft = this.x0 + this.width / 2 - this.getRowWidth() / 2 + 2; @@ -126,25 +126,25 @@ public class GuiScrollPane extends SlotGui { int maxScroll = this.getMaxScroll(); if (maxScroll > 0) { int k1 = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) / (float) this.getMaxPosition()); - k1 = MathHelper.clamp(k1, 32, this.y1 - this.y0 - 8); + k1 = Mth.clamp(k1, 32, this.y1 - this.y0 - 8); int l1 = (int) this.yo * (this.y1 - this.y0 - k1) / maxScroll + this.y0; if (l1 < this.y0) { l1 = this.y0; } - bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + bufferbuilder.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR); bufferbuilder.vertex(scrollbarLeft, this.y1, 0.0F).uv(0.0F, 1.0F).color(0, 0, 0, 255).endVertex(); bufferbuilder.vertex(scrollbarRight, this.y1, 0.0F).uv(1.0F, 1.0F).color(0, 0, 0, 255).endVertex(); bufferbuilder.vertex(scrollbarRight, this.y0, 0.0F).uv(1.0F, 0.0F).color(0, 0, 0, 255).endVertex(); bufferbuilder.vertex(scrollbarLeft, this.y0, 0.0F).uv(0.0F, 0.0F).color(0, 0, 0, 255).endVertex(); tessellator.end(); - bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + bufferbuilder.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR); bufferbuilder.vertex(scrollbarLeft, l1 + k1, 0.0F).uv(0.0F, 1.0F).color(128, 128, 128, 255).endVertex(); bufferbuilder.vertex(scrollbarRight, l1 + k1, 0.0F).uv(1.0F, 1.0F).color(128, 128, 128, 255).endVertex(); bufferbuilder.vertex(scrollbarRight, l1, 0.0F).uv(1.0F, 0.0F).color(128, 128, 128, 255).endVertex(); bufferbuilder.vertex(scrollbarLeft, l1, 0.0F).uv(0.0F, 0.0F).color(128, 128, 128, 255).endVertex(); tessellator.end(); - bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR); + bufferbuilder.begin(7, DefaultVertexFormat.POSITION_TEX_COLOR); bufferbuilder.vertex(scrollbarLeft, l1 + k1 - 1, 0.0F).uv(0.0F, 1.0F).color(192, 192, 192, 255).endVertex(); bufferbuilder.vertex(scrollbarRight - 1, l1 + k1 - 1, 0.0F).uv(1.0F, 1.0F).color(192, 192, 192, 255).endVertex(); bufferbuilder.vertex(scrollbarRight - 1, l1, 0.0F).uv(1.0F, 0.0F).color(192, 192, 192, 255).endVertex(); @@ -178,7 +178,7 @@ public class GuiScrollPane extends SlotGui { } @Override - protected void renderItem(MatrixStack ms, int slotIndex, int xPos, int yPos, int heightIn, int mouseXIn, int mouseYIn, float partialTicks) { + protected void renderItem(PoseStack ms, int slotIndex, int xPos, int yPos, int heightIn, int mouseXIn, int mouseYIn, float partialTicks) { this.getListEntry(slotIndex).drawEntry(ms, slotIndex, xPos, yPos, this.getRowWidth(), heightIn, mouseXIn, mouseYIn, this.getSlotIndexFromScreenCoords(mouseXIn, mouseYIn) == slotIndex, partialTicks); } @@ -210,7 +210,7 @@ public class GuiScrollPane extends SlotGui { } @Override - public List children() { + public List children() { return null; } @@ -305,7 +305,7 @@ public class GuiScrollPane extends SlotGui { int l1 = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) / (float) this.getMaxPosition()); - l1 = MathHelper.clamp(l1, 32, this.y1 - this.y0 - 8); + l1 = Mth.clamp(l1, 32, this.y1 - this.y0 - 8); this.scrollMultiplier /= (float) (this.y1 - this.y0 - l1) / (float) maxScroll; } else { this.scrollMultiplier = 1.0F; @@ -332,9 +332,9 @@ public class GuiScrollPane extends SlotGui { //Draw in center if it fits @Override - protected void renderList(MatrixStack ms, int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks) { + protected void renderList(PoseStack ms, int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks) { int itemCount = this.getItemCount(); - Tessellator tessellator = Tessellator.getInstance(); + Tesselator tessellator = Tesselator.getInstance(); BufferBuilder bufferbuilder = tessellator.getBuilder(); //Find y to start with @@ -362,14 +362,14 @@ public class GuiScrollPane extends SlotGui { RenderSystem.disableTexture(); float f = this.isFocused() ? 1.0F : 0.5F; RenderSystem.color4f(f, f, f, 1.0F); - bufferbuilder.begin(7, DefaultVertexFormats.POSITION); + bufferbuilder.begin(7, DefaultVertexFormat.POSITION); bufferbuilder.vertex(i1, y + entryHeight2 + 2, 0.0D).endVertex(); bufferbuilder.vertex(j1, y + entryHeight2 + 2, 0.0D).endVertex(); bufferbuilder.vertex(j1, y - 2, 0.0D).endVertex(); bufferbuilder.vertex(i1, y - 2, 0.0D).endVertex(); tessellator.end(); RenderSystem.color4f(0.0F, 0.0F, 0.0F, 1.0F); - bufferbuilder.begin(7, DefaultVertexFormats.POSITION); + bufferbuilder.begin(7, DefaultVertexFormat.POSITION); bufferbuilder.vertex(i1 + 1, y + entryHeight2 + 1, 0.0D).endVertex(); bufferbuilder.vertex(j1 - 1, y + entryHeight2 + 1, 0.0D).endVertex(); bufferbuilder.vertex(j1 - 1, y - 1, 0.0D).endVertex(); @@ -404,7 +404,7 @@ public class GuiScrollPane extends SlotGui { } //PASSTHROUGHS - public void init(List buttonList) { + public void init(List buttonList) { for (IScrollEntry entry : this.listEntries) { entry.init(buttonList); } @@ -415,7 +415,7 @@ public class GuiScrollPane extends SlotGui { entry.updateScreen(); } - public void drawTooltip(MatrixStack ms, Screen guiScreen, int mouseX, int mouseY) { + public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) { for (IScrollEntry entry : this.listEntries) entry.drawTooltip(ms, guiScreen, mouseX, mouseY); } @@ -442,11 +442,11 @@ public class GuiScrollPane extends SlotGui { } public interface IScrollEntry { - void init(List buttonList); + void init(List buttonList); void updateScreen(); - void drawTooltip(MatrixStack ms, Screen guiScreen, int mouseX, int mouseY); + void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY); boolean charTyped(char eventChar, int eventKey); @@ -456,7 +456,7 @@ public class GuiScrollPane extends SlotGui { void updatePosition(int slotIndex, int x, int y, float partialTicks); - void drawEntry(MatrixStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks); + void drawEntry(PoseStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks); /** * Called when the mouse is clicked within this entry. Returning true means that something within this entry was diff --git a/src/main/java/nl/requios/effortlessbuilding/gui/elements/SlotGui.java b/src/main/java/nl/requios/effortlessbuilding/gui/elements/SlotGui.java index e1c5b73..0e6afd8 100644 --- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/SlotGui.java +++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/SlotGui.java @@ -1,16 +1,16 @@ package nl.requios.effortlessbuilding.gui.elements; -import com.mojang.blaze3d.matrix.MatrixStack; +import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.systems.RenderSystem; import mcp.MethodsReturnNonnullByDefault; import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.FocusableGui; -import net.minecraft.client.gui.IGuiEventListener; -import net.minecraft.client.gui.IRenderable; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.math.MathHelper; +import net.minecraft.client.gui.components.events.AbstractContainerEventHandler; +import net.minecraft.client.gui.components.events.GuiEventListener; +import net.minecraft.client.gui.components.Widget; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.Tesselator; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import net.minecraft.util.Mth; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; @@ -22,7 +22,7 @@ import java.util.List; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault @SuppressWarnings("deprecation") -public abstract class SlotGui extends FocusableGui implements IRenderable { +public abstract class SlotGui extends AbstractContainerEventHandler implements Widget { protected final Minecraft minecraft; protected final int itemHeight; protected int width; @@ -56,7 +56,7 @@ public abstract class SlotGui extends FocusableGui implements IRenderable { protected abstract int getItemCount(); - public List children() { + public List children() { return Collections.emptyList(); } @@ -75,9 +75,9 @@ public abstract class SlotGui extends FocusableGui implements IRenderable { protected void updateItemPosition(int p_updateItemPosition_1_, int p_updateItemPosition_2_, int p_updateItemPosition_3_, float p_updateItemPosition_4_) { } - protected abstract void renderItem(MatrixStack ms, int p_renderItem_1_, int p_renderItem_2_, int p_renderItem_3_, int p_renderItem_4_, int p_renderItem_5_, int p_renderItem_6_, float p_renderItem_7_); + protected abstract void renderItem(PoseStack ms, int p_renderItem_1_, int p_renderItem_2_, int p_renderItem_3_, int p_renderItem_4_, int p_renderItem_5_, int p_renderItem_6_, float p_renderItem_7_); - protected void renderHeader(int p_renderHeader_1_, int p_renderHeader_2_, Tessellator p_renderHeader_3_) { + protected void renderHeader(int p_renderHeader_1_, int p_renderHeader_2_, Tesselator p_renderHeader_3_) { } protected void clickedHeader(int p_clickedHeader_1_, int p_clickedHeader_2_) { @@ -86,13 +86,13 @@ public abstract class SlotGui extends FocusableGui implements IRenderable { public int getItemAtPosition(double p_getItemAtPosition_1_, double p_getItemAtPosition_3_) { int i = this.x0 + this.width / 2 - this.getRowWidth() / 2; int j = this.x0 + this.width / 2 + this.getRowWidth() / 2; - int k = MathHelper.floor(p_getItemAtPosition_3_ - (double) this.y0) - this.headerHeight + (int) this.yo - 4; + int k = Mth.floor(p_getItemAtPosition_3_ - (double) this.y0) - this.headerHeight + (int) this.yo - 4; int l = k / this.itemHeight; return p_getItemAtPosition_1_ < (double) this.getScrollbarPosition() && p_getItemAtPosition_1_ >= (double) i && p_getItemAtPosition_1_ <= (double) j && l >= 0 && k >= 0 && l < this.getItemCount() ? l : -1; } protected void capYPosition() { - this.yo = MathHelper.clamp(this.yo, 0.0D, this.getMaxScroll()); + this.yo = Mth.clamp(this.yo, 0.0D, this.getMaxScroll()); } public int getMaxScroll() { @@ -107,7 +107,7 @@ public abstract class SlotGui extends FocusableGui implements IRenderable { return p_isMouseInList_3_ >= (double) this.y0 && p_isMouseInList_3_ <= (double) this.y1 && p_isMouseInList_1_ >= (double) this.x0 && p_isMouseInList_1_ <= (double) this.x1; } - public abstract void render(MatrixStack ms, int p_render_1_, int p_render_2_, float p_render_3_); + public abstract void render(PoseStack ms, int p_render_1_, int p_render_2_, float p_render_3_); protected void updateScrollingState(double p_updateScrollingState_1_, double p_updateScrollingState_3_, int p_updateScrollingState_5_) { this.scrolling = p_updateScrollingState_5_ == 0 && p_updateScrollingState_1_ >= (double) this.getScrollbarPosition() && p_updateScrollingState_1_ < (double) (this.getScrollbarPosition() + 6); @@ -158,7 +158,7 @@ public abstract class SlotGui extends FocusableGui implements IRenderable { } int i = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) / (float) this.getMaxPosition()); - i = MathHelper.clamp(i, 32, this.y1 - this.y0 - 8); + i = Mth.clamp(i, 32, this.y1 - this.y0 - 8); double d1 = d0 / (double) (this.y1 - this.y0 - i); if (d1 < 1.0D) { d1 = 1.0D; @@ -214,9 +214,9 @@ public abstract class SlotGui extends FocusableGui implements IRenderable { return 220; } - protected void renderList(MatrixStack ms, int p_renderList_1_, int p_renderList_2_, int p_renderList_3_, int p_renderList_4_, float p_renderList_5_) { + protected void renderList(PoseStack ms, int p_renderList_1_, int p_renderList_2_, int p_renderList_3_, int p_renderList_4_, float p_renderList_5_) { int i = this.getItemCount(); - Tessellator tessellator = Tessellator.getInstance(); + Tesselator tessellator = Tesselator.getInstance(); BufferBuilder bufferbuilder = tessellator.getBuilder(); for (int j = 0; j < i; ++j) { @@ -232,14 +232,14 @@ public abstract class SlotGui extends FocusableGui implements IRenderable { RenderSystem.disableTexture(); float f = this.isFocused() ? 1.0F : 0.5F; RenderSystem.color4f(f, f, f, 1.0F); - bufferbuilder.begin(7, DefaultVertexFormats.POSITION); + bufferbuilder.begin(7, DefaultVertexFormat.POSITION); bufferbuilder.vertex(i1, k + l + 2, 0.0D).endVertex(); bufferbuilder.vertex(j1, k + l + 2, 0.0D).endVertex(); bufferbuilder.vertex(j1, k - 2, 0.0D).endVertex(); bufferbuilder.vertex(i1, k - 2, 0.0D).endVertex(); tessellator.end(); RenderSystem.color4f(0.0F, 0.0F, 0.0F, 1.0F); - bufferbuilder.begin(7, DefaultVertexFormats.POSITION); + bufferbuilder.begin(7, DefaultVertexFormat.POSITION); bufferbuilder.vertex(i1 + 1, k + l + 1, 0.0D).endVertex(); bufferbuilder.vertex(j1 - 1, k + l + 1, 0.0D).endVertex(); bufferbuilder.vertex(j1 - 1, k - 1, 0.0D).endVertex(); diff --git a/src/main/java/nl/requios/effortlessbuilding/helper/InventoryHelper.java b/src/main/java/nl/requios/effortlessbuilding/helper/InventoryHelper.java index d4fb158..5b1f34f 100644 --- a/src/main/java/nl/requios/effortlessbuilding/helper/InventoryHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/helper/InventoryHelper.java @@ -1,13 +1,13 @@ package nl.requios.effortlessbuilding.helper; -import net.minecraft.block.Block; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.ItemStack; public class InventoryHelper { - public static ItemStack findItemStackInInventory(PlayerEntity player, Block block) { + public static ItemStack findItemStackInInventory(Player player, Block block) { for (ItemStack invStack : player.inventory.items) { if (!invStack.isEmpty() && invStack.getItem() instanceof BlockItem && ((BlockItem) invStack.getItem()).getBlock().equals(block)) { @@ -17,7 +17,7 @@ public class InventoryHelper { return ItemStack.EMPTY; } - public static int findTotalBlocksInInventory(PlayerEntity player, Block block) { + public static int findTotalBlocksInInventory(Player player, Block block) { int total = 0; for (ItemStack invStack : player.inventory.items) { if (!invStack.isEmpty() && invStack.getItem() instanceof BlockItem && diff --git a/src/main/java/nl/requios/effortlessbuilding/helper/ReachHelper.java b/src/main/java/nl/requios/effortlessbuilding/helper/ReachHelper.java index 490163b..81faac8 100644 --- a/src/main/java/nl/requios/effortlessbuilding/helper/ReachHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/helper/ReachHelper.java @@ -1,12 +1,12 @@ package nl.requios.effortlessbuilding.helper; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.math.MathHelper; +import net.minecraft.world.entity.player.Player; +import net.minecraft.util.Mth; import nl.requios.effortlessbuilding.BuildConfig; import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager; public class ReachHelper { - public static int getMaxReach(PlayerEntity player) { + public static int getMaxReach(Player player) { if (player.isCreative()) return BuildConfig.reach.maxReachCreative.get(); if (!BuildConfig.reach.enableReachUpgrades.get()) return BuildConfig.reach.maxReachLevel3.get(); @@ -26,29 +26,29 @@ public class ReachHelper { return BuildConfig.reach.maxReachLevel0.get(); } - public static int getPlacementReach(PlayerEntity player) { + public static int getPlacementReach(Player player) { return getMaxReach(player) / 4; } - public static int getMaxBlocksPlacedAtOnce(PlayerEntity player) { + public static int getMaxBlocksPlacedAtOnce(Player player) { if (player.isCreative()) return 1000000; - return MathHelper.ceil(Math.pow(getMaxReach(player), 1.6)); + return Mth.ceil(Math.pow(getMaxReach(player), 1.6)); //Level 0: 121 //Level 1: 523 //Level 2: 1585 //Level 3: 4805 } - public static int getMaxBlocksPerAxis(PlayerEntity player) { + public static int getMaxBlocksPerAxis(Player player) { if (player.isCreative()) return 2000; - return MathHelper.ceil(getMaxReach(player) * 0.3); + return Mth.ceil(getMaxReach(player) * 0.3); //Level 0: 6 //Level 1: 15 //Level 2: 30 //Level 3: 60 } - public static boolean canBreakFar(PlayerEntity player) { + public static boolean canBreakFar(Player player) { return player.isCreative() || BuildConfig.survivalBalancers.breakFar.get(); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java b/src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java index d0b72a0..b562f9a 100644 --- a/src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java +++ b/src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java @@ -2,20 +2,20 @@ package nl.requios.effortlessbuilding.helper; import net.minecraft.advancements.CriteriaTriggers; import net.minecraft.block.*; -import net.minecraft.block.material.Material; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.CachedBlockInfo; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.world.World; +import net.minecraft.world.level.material.Material; +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.ToolType; import nl.requios.effortlessbuilding.BuildConfig; import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager; @@ -24,13 +24,19 @@ 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; + public class SurvivalHelper { //Used for all placing of blocks in this mod. //Checks if area is loaded, if player has the right permissions, if existing block can be replaced (drops it if so) and consumes an item from the stack. //Based on ItemBlock#onItemUse - public static boolean placeBlock(World world, PlayerEntity player, BlockPos pos, BlockState blockState, - ItemStack origstack, Direction facing, Vector3d hitVec, boolean skipPlaceCheck, + public static boolean placeBlock(Level world, Player player, BlockPos pos, BlockState blockState, + ItemStack origstack, Direction facing, Vec3 hitVec, boolean skipPlaceCheck, boolean skipCollisionCheck, boolean playSound) { if (!world.isLoaded(pos)) return false; ItemStack itemstack = origstack; @@ -62,15 +68,15 @@ public class SurvivalHelper { if (!world.setBlock(pos, blockState, 3)) return false; BlockItem.updateCustomBlockEntityTag(world, player, pos, itemstack); //Actually BlockItem::onBlockPlaced but that is protected block.setPlacedBy(world, pos, blockState, player, itemstack); - if (player instanceof ServerPlayerEntity) { - CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayerEntity) player, pos, itemstack); + if (player instanceof ServerPlayer) { + CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer) player, pos, itemstack); } BlockState afterState = world.getBlockState(pos); if (playSound) { SoundType soundtype = afterState.getBlock().getSoundType(afterState, world, pos, player); - world.playSound(null, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); + world.playSound(null, pos, soundtype.getPlaceSound(), SoundSource.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F); } if (!player.isCreative() && Block.byItem(itemstack.getItem()) == block) { @@ -108,7 +114,7 @@ public class SurvivalHelper { //Used for all breaking of blocks in this mod. //Checks if area is loaded, if appropriate tool is used in survival mode, and drops the block directly into the players inventory - public static boolean breakBlock(World world, PlayerEntity player, BlockPos pos, boolean skipChecks) { + public static boolean breakBlock(Level world, Player player, BlockPos pos, boolean skipChecks) { if (!world.isLoaded(pos) && !world.isEmptyBlock(pos)) return false; //Check if can break @@ -129,7 +135,7 @@ public class SurvivalHelper { } //Gives items directly to player - public static void dropBlock(World world, PlayerEntity player, BlockPos pos) { + public static void dropBlock(Level world, Player player, BlockPos pos) { if (player.isCreative()) return; BlockState blockState = world.getBlockState(pos); @@ -180,7 +186,7 @@ public class SurvivalHelper { * @param sidePlacedOn * @return Whether the player may place the block at pos with itemstack */ - public static boolean canPlace(World world, PlayerEntity player, BlockPos pos, BlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, Direction sidePlacedOn) { + public static boolean canPlace(Level world, Player player, BlockPos pos, BlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, Direction sidePlacedOn) { //Check if itemstack is correct if (!(itemStack.getItem() instanceof BlockItem) || Block.byItem(itemStack.getItem()) != newBlockState.getBlock()) { @@ -198,7 +204,7 @@ public class SurvivalHelper { } //Can be harvested with hand? (or in creative) - private static boolean canReplace(World world, PlayerEntity player, BlockPos pos) { + private static boolean canReplace(Level world, Player player, BlockPos pos) { if (player.isCreative()) return true; BlockState state = world.getBlockState(pos); @@ -220,7 +226,7 @@ public class SurvivalHelper { } //From EntityPlayer#canPlayerEdit - private static boolean canPlayerEdit(PlayerEntity player, World world, BlockPos pos, ItemStack stack) { + private static boolean canPlayerEdit(Player player, Level world, BlockPos pos, ItemStack stack) { if (!world.mayInteract(player, pos)) return false; if (player.abilities.mayBuild) { @@ -228,14 +234,14 @@ public class SurvivalHelper { return true; } else { //Adventure mode - CachedBlockInfo blockworldstate = new CachedBlockInfo(world, pos, false); + BlockInWorld blockworldstate = new BlockInWorld(world, pos, false); return stack.hasAdventureModePlaceTagForBlock(world.getTagManager(), blockworldstate); } } //From World#mayPlace - private static boolean mayPlace(World world, Block blockIn, BlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, Direction sidePlacedOn, @Nullable Entity placer) { + private static boolean mayPlace(Level world, Block blockIn, BlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, Direction sidePlacedOn, @Nullable Entity placer) { BlockState iblockstate1 = world.getBlockState(pos); VoxelShape voxelShape = skipCollisionCheck ? null : blockIn.defaultBlockState().getCollisionShape(world, pos); @@ -244,7 +250,7 @@ public class SurvivalHelper { } //Check if double slab - if (placer != null && doesBecomeDoubleSlab(((PlayerEntity) placer), pos, sidePlacedOn)) { + if (placer != null && doesBecomeDoubleSlab(((Player) placer), pos, sidePlacedOn)) { return true; } @@ -260,7 +266,7 @@ public class SurvivalHelper { } //Check quickreplace - if (placer instanceof PlayerEntity && ModifierSettingsManager.getModifierSettings(((PlayerEntity) placer)).doQuickReplace()) { + if (placer instanceof Player && ModifierSettingsManager.getModifierSettings(((Player) placer)).doQuickReplace()) { return true; } @@ -270,7 +276,7 @@ public class SurvivalHelper { //Can break using held tool? (or in creative) - public static boolean canBreak(World world, PlayerEntity player, BlockPos pos) { + public static boolean canBreak(Level world, Player player, BlockPos pos) { BlockState blockState = world.getBlockState(pos); if (!world.getFluidState(pos).isEmpty()) return false; @@ -280,7 +286,7 @@ public class SurvivalHelper { } //From ForgeHooks#canHarvestBlock - public static boolean canHarvestBlock(@Nonnull Block block, @Nonnull PlayerEntity player, @Nonnull World world, @Nonnull BlockPos pos) { + public static boolean canHarvestBlock(@Nonnull Block block, @Nonnull Player player, @Nonnull Level world, @Nonnull BlockPos pos) { BlockState state = world.getBlockState(pos); //Dont break bedrock @@ -308,10 +314,10 @@ public class SurvivalHelper { return toolLevel >= block.getHarvestLevel(state); } - public static boolean doesBecomeDoubleSlab(PlayerEntity player, BlockPos pos, Direction facing) { + public static boolean doesBecomeDoubleSlab(Player player, BlockPos pos, Direction facing) { BlockState placedBlockState = player.level.getBlockState(pos); - ItemStack itemstack = player.getItemInHand(Hand.MAIN_HAND); + ItemStack itemstack = player.getItemInHand(InteractionHand.MAIN_HAND); if (CompatHelper.isItemBlockProxy(itemstack)) itemstack = CompatHelper.getItemBlockFromStack(itemstack); diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ItemRandomizerBag.java b/src/main/java/nl/requios/effortlessbuilding/item/ItemRandomizerBag.java index b056e8d..01b94e8 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ItemRandomizerBag.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ItemRandomizerBag.java @@ -1,29 +1,29 @@ package nl.requios.effortlessbuilding.item; import mcp.MethodsReturnNonnullByDefault; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.PlayerInventory; -import net.minecraft.entity.player.ServerPlayerEntity; -import net.minecraft.fluid.Fluids; -import net.minecraft.inventory.container.Container; -import net.minecraft.inventory.container.INamedContainerProvider; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.entity.player.Inventory; +import net.minecraft.server.level.ServerPlayer; +import net.minecraft.world.level.material.Fluids; +import net.minecraft.world.inventory.AbstractContainerMenu; +import net.minecraft.world.MenuProvider; import net.minecraft.item.*; -import net.minecraft.nbt.CompoundNBT; -import net.minecraft.util.ActionResult; -import net.minecraft.util.ActionResultType; -import net.minecraft.util.Direction; -import net.minecraft.util.Hand; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.util.text.TranslationTextComponent; -import net.minecraft.world.World; +import net.minecraft.nbt.CompoundTag; +import net.minecraft.world.InteractionResultHolder; +import net.minecraft.world.InteractionResult; +import net.minecraft.core.Direction; +import net.minecraft.world.InteractionHand; +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.network.chat.TranslatableComponent; +import net.minecraft.world.level.Level; import net.minecraftforge.common.capabilities.ICapabilityProvider; import net.minecraftforge.fml.network.NetworkHooks; import net.minecraftforge.items.CapabilityItemHandler; @@ -43,6 +43,12 @@ import java.util.Calendar; import java.util.List; import java.util.Random; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.context.BlockPlaceContext; +import net.minecraft.world.item.context.UseOnContext; + @MethodsReturnNonnullByDefault @ParametersAreNonnullByDefault public class ItemRandomizerBag extends Item { @@ -52,7 +58,7 @@ public class ItemRandomizerBag extends Item { private static final Random rand = new Random(currentSeed); public ItemRandomizerBag() { - super(new Item.Properties().tab(ItemGroup.TAB_TOOLS).stacksTo(1)); + super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1)); this.setRegistryName(EffortlessBuilding.MODID, "randomizer_bag"); } @@ -122,40 +128,40 @@ public class ItemRandomizerBag extends Item { } @Override - public ActionResultType useOn(ItemUseContext ctx) { - PlayerEntity player = ctx.getPlayer(); - World world = ctx.getLevel(); + public InteractionResult useOn(UseOnContext ctx) { + Player player = ctx.getPlayer(); + Level world = ctx.getLevel(); BlockPos pos = ctx.getClickedPos(); Direction facing = ctx.getClickedFace(); ItemStack item = ctx.getItemInHand(); - Vector3d hitVec = ctx.getClickLocation(); + Vec3 hitVec = ctx.getClickLocation(); - if (player == null) return ActionResultType.FAIL; + if (player == null) return InteractionResult.FAIL; if (ctx.getPlayer() != null && ctx.getPlayer().isShiftKeyDown()) { //ctx.isPlacerSneaking() - if (world.isClientSide) return ActionResultType.SUCCESS; + if (world.isClientSide) return InteractionResult.SUCCESS; //Open inventory - NetworkHooks.openGui((ServerPlayerEntity) player, new ContainerProvider(item)); + NetworkHooks.openGui((ServerPlayer) player, new ContainerProvider(item)); } else { - if (world.isClientSide) return ActionResultType.SUCCESS; + if (world.isClientSide) return InteractionResult.SUCCESS; //Only place manually if in normal vanilla mode BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode(); ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); if (buildMode != BuildModes.BuildModeEnum.NORMAL || modifierSettings.doQuickReplace()) { - return ActionResultType.FAIL; + return InteractionResult.FAIL; } //Use item //Get bag inventory //TODO offhand support - ItemStack bag = player.getItemInHand(Hand.MAIN_HAND); + ItemStack bag = player.getItemInHand(InteractionHand.MAIN_HAND); IItemHandler bagInventory = getBagInventory(bag); if (bagInventory == null) - return ActionResultType.FAIL; + return InteractionResult.FAIL; ItemStack toPlace = pickRandomStack(bagInventory); - if (toPlace.isEmpty()) return ActionResultType.FAIL; + if (toPlace.isEmpty()) return InteractionResult.FAIL; //Previously: use onItemUse to place block (no synergy) //bag.setItemDamage(toPlace.getMetadata()); @@ -166,7 +172,7 @@ public class ItemRandomizerBag extends Item { pos = pos.relative(facing); } - BlockItemUseContext blockItemUseContext = new BlockItemUseContext(new ItemUseContext(player, Hand.MAIN_HAND, new BlockRayTraceResult(hitVec, facing, pos, false))); + BlockPlaceContext blockItemUseContext = new BlockPlaceContext(new UseOnContext(player, InteractionHand.MAIN_HAND, new BlockHitResult(hitVec, facing, pos, false))); BlockState blockState = Block.byItem(toPlace.getItem()).getStateForPlacement(blockItemUseContext); SurvivalHelper.placeBlock(world, player, pos, blockState, toPlace, facing, hitVec, false, false, true); @@ -178,30 +184,30 @@ public class ItemRandomizerBag extends Item { // Mirror.onBlockPlaced(placeEvent); // Array.onBlockPlaced(placeEvent); } - return ActionResultType.SUCCESS; + return InteractionResult.SUCCESS; } @Override - public ActionResult use(World world, PlayerEntity player, Hand hand) { + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { ItemStack bag = player.getItemInHand(hand); if (player.isShiftKeyDown()) { - if (world.isClientSide) return new ActionResult<>(ActionResultType.SUCCESS, bag); + if (world.isClientSide) return new InteractionResultHolder<>(InteractionResult.SUCCESS, bag); //Open inventory - NetworkHooks.openGui((ServerPlayerEntity) player, new ContainerProvider(bag)); + NetworkHooks.openGui((ServerPlayer) player, new ContainerProvider(bag)); } else { //Use item //Get bag inventory IItemHandler bagInventory = getBagInventory(bag); if (bagInventory == null) - return new ActionResult<>(ActionResultType.FAIL, bag); + return new InteractionResultHolder<>(InteractionResult.FAIL, bag); ItemStack toUse = pickRandomStack(bagInventory); - if (toUse.isEmpty()) return new ActionResult<>(ActionResultType.FAIL, bag); + if (toUse.isEmpty()) return new InteractionResultHolder<>(InteractionResult.FAIL, bag); return toUse.use(world, player, hand); } - return new ActionResult<>(ActionResultType.PASS, bag); + return new InteractionResultHolder<>(InteractionResult.PASS, bag); } @Override @@ -211,16 +217,16 @@ public class ItemRandomizerBag extends Item { @Nullable @Override - public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundNBT nbt) { + public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundTag nbt) { return new ItemHandlerCapabilityProvider(); } @Override - public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new StringTextComponent(TextFormatting.BLUE + "Rightclick" + TextFormatting.GRAY + " to place a random block")); - tooltip.add(new StringTextComponent(TextFormatting.BLUE + "Sneak + rightclick" + TextFormatting.GRAY + " to open inventory")); + 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")); if (world != null && world.players().size() > 1) { - tooltip.add(new StringTextComponent(TextFormatting.YELLOW + "Experimental on servers: may lose inventory")); + tooltip.add(new TextComponent(ChatFormatting.YELLOW + "Experimental on servers: may lose inventory")); } } @@ -229,7 +235,7 @@ public class ItemRandomizerBag extends Item { return this.getRegistryName().toString(); } - public static class ContainerProvider implements INamedContainerProvider { + public static class ContainerProvider implements MenuProvider { private final ItemStack bag; @@ -238,13 +244,13 @@ public class ItemRandomizerBag extends Item { } @Override - public ITextComponent getDisplayName() { - return new TranslationTextComponent("effortlessbuilding.screen.randomizer_bag"); + public Component getDisplayName() { + return new TranslatableComponent("effortlessbuilding.screen.randomizer_bag"); } @Nullable @Override - public Container createMenu(int containerId, PlayerInventory playerInventory, PlayerEntity player) { + public AbstractContainerMenu createMenu(int containerId, Inventory playerInventory, Player player) { return new RandomizerBagContainer(containerId, playerInventory, ItemRandomizerBag.getBagInventory(bag)); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade1.java b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade1.java index 56c3f63..bdd6efa 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade1.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade1.java @@ -1,16 +1,16 @@ package nl.requios.effortlessbuilding.item; import mcp.MethodsReturnNonnullByDefault; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; import net.minecraft.util.*; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; +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; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager; @@ -20,21 +20,27 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.InteractionResultHolder; + @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class ItemReachUpgrade1 extends Item { public ItemReachUpgrade1() { - super(new Item.Properties().tab(ItemGroup.TAB_TOOLS).stacksTo(1)); + super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1)); this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade1"); } @Override - public ActionResult use(World world, PlayerEntity player, Hand hand) { + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { if (player.isCreative()) { if (world.isClientSide) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative."); if (world.isClientSide) EffortlessBuilding.log(player, "Still want increased reach? Use the config."); - return new ActionResult<>(ActionResultType.PASS, player.getItemInHand(hand)); + return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand)); } ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); @@ -55,12 +61,12 @@ public class ItemReachUpgrade1 extends Item { SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather")); player.playSound(soundEvent, 1f, 1f); } - return new ActionResult<>(ActionResultType.PASS, player.getItemInHand(hand)); + return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand)); } @Override - public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new StringTextComponent(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel1.get())); + 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())); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade2.java b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade2.java index 83f0833..ecca012 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade2.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade2.java @@ -1,16 +1,16 @@ package nl.requios.effortlessbuilding.item; import mcp.MethodsReturnNonnullByDefault; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; import net.minecraft.util.*; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; +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; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager; @@ -20,21 +20,27 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.InteractionResultHolder; + @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class ItemReachUpgrade2 extends Item { public ItemReachUpgrade2() { - super(new Item.Properties().tab(ItemGroup.TAB_TOOLS).stacksTo(1)); + super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1)); this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade2"); } @Override - public ActionResult use(World world, PlayerEntity player, Hand hand) { + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { if (player.isCreative()) { if (world.isClientSide) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative."); if (world.isClientSide) EffortlessBuilding.log(player, "Still want increased reach? Use the config."); - return new ActionResult<>(ActionResultType.PASS, player.getItemInHand(hand)); + return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand)); } ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); @@ -59,13 +65,13 @@ public class ItemReachUpgrade2 extends Item { SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather")); player.playSound(soundEvent, 1f, 1f); } - return new ActionResult<>(ActionResultType.PASS, player.getItemInHand(hand)); + return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand)); } @Override - public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new StringTextComponent(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel2.get())); - tooltip.add(new StringTextComponent(TextFormatting.GRAY + "Previous upgrades need to be consumed first")); + 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 diff --git a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade3.java b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade3.java index 281cb9e..832f194 100644 --- a/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade3.java +++ b/src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade3.java @@ -1,16 +1,16 @@ package nl.requios.effortlessbuilding.item; import mcp.MethodsReturnNonnullByDefault; -import net.minecraft.client.util.ITooltipFlag; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.Item; -import net.minecraft.item.ItemGroup; -import net.minecraft.item.ItemStack; +import net.minecraft.world.item.TooltipFlag; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.ItemStack; import net.minecraft.util.*; -import net.minecraft.util.text.ITextComponent; -import net.minecraft.util.text.StringTextComponent; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; +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; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager; @@ -20,21 +20,27 @@ import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; import java.util.List; +import net.minecraft.resources.ResourceLocation; +import net.minecraft.sounds.SoundEvent; +import net.minecraft.world.InteractionHand; +import net.minecraft.world.InteractionResult; +import net.minecraft.world.InteractionResultHolder; + @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class ItemReachUpgrade3 extends Item { public ItemReachUpgrade3() { - super(new Item.Properties().tab(ItemGroup.TAB_TOOLS).stacksTo(1)); + super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1)); this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade3"); } @Override - public ActionResult use(World world, PlayerEntity player, Hand hand) { + public InteractionResultHolder use(Level world, Player player, InteractionHand hand) { if (player.isCreative()) { if (world.isClientSide) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative."); if (world.isClientSide) EffortlessBuilding.log(player, "Still want increased reach? Use the config."); - return new ActionResult<>(ActionResultType.PASS, player.getItemInHand(hand)); + return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand)); } ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); @@ -62,13 +68,13 @@ public class ItemReachUpgrade3 extends Item { SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather")); player.playSound(soundEvent, 1f, 1f); } - return new ActionResult<>(ActionResultType.PASS, player.getItemInHand(hand)); + return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand)); } @Override - public void appendHoverText(ItemStack stack, @Nullable World world, List tooltip, ITooltipFlag flag) { - tooltip.add(new StringTextComponent(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel3.get())); - tooltip.add(new StringTextComponent(TextFormatting.GRAY + "Previous upgrades need to be consumed first")); + 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")); } @Override diff --git a/src/main/java/nl/requios/effortlessbuilding/network/AddUndoMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/AddUndoMessage.java index f7df013..dcd511d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/AddUndoMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/AddUndoMessage.java @@ -1,11 +1,11 @@ package nl.requios.effortlessbuilding.network; -import net.minecraft.block.Block; -import net.minecraft.block.BlockState; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.entity.player.Player; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.fml.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -35,7 +35,7 @@ public class AddUndoMessage { this.newBlockState = newBlockState; } - public static void encode(AddUndoMessage message, PacketBuffer buf) { + public static void encode(AddUndoMessage message, FriendlyByteBuf buf) { buf.writeInt(message.coordinate.getX()); buf.writeInt(message.coordinate.getY()); buf.writeInt(message.coordinate.getZ()); @@ -43,7 +43,7 @@ public class AddUndoMessage { buf.writeInt(Block.getId(message.newBlockState)); } - public static AddUndoMessage decode(PacketBuffer buf) { + public static AddUndoMessage decode(FriendlyByteBuf buf) { BlockPos coordinate = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt()); BlockState previousBlockState = Block.stateById(buf.readInt()); BlockState newBlockState = Block.stateById(buf.readInt()); @@ -68,7 +68,7 @@ public class AddUndoMessage { if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) { //Received clientside - PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); + Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); //Add to undo stack clientside //Only the appropriate player that needs to add this to the undo stack gets this message UndoRedo.addUndo(player, new BlockSet( @@ -81,7 +81,7 @@ public class AddUndoMessage { new ArrayList() {{ add(message.getNewBlockState()); }}, - new Vector3d(0, 0, 0), + new Vec3(0, 0, 0), message.getCoordinate(), message.getCoordinate())); } }); diff --git a/src/main/java/nl/requios/effortlessbuilding/network/BlockBrokenMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/BlockBrokenMessage.java index 1b22f33..5883e7d 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/BlockBrokenMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/BlockBrokenMessage.java @@ -1,11 +1,11 @@ package nl.requios.effortlessbuilding.network; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.fml.network.NetworkEvent; import nl.requios.effortlessbuilding.buildmode.BuildModes; @@ -20,30 +20,30 @@ public class BlockBrokenMessage { private final boolean blockHit; private final BlockPos blockPos; private final Direction sideHit; - private final Vector3d hitVec; + private final Vec3 hitVec; public BlockBrokenMessage() { this.blockHit = false; this.blockPos = BlockPos.ZERO; this.sideHit = Direction.UP; - this.hitVec = new Vector3d(0, 0, 0); + this.hitVec = new Vec3(0, 0, 0); } - public BlockBrokenMessage(BlockRayTraceResult result) { - this.blockHit = result.getType() == RayTraceResult.Type.BLOCK; + public BlockBrokenMessage(BlockHitResult result) { + this.blockHit = result.getType() == HitResult.Type.BLOCK; this.blockPos = result.getBlockPos(); this.sideHit = result.getDirection(); this.hitVec = result.getLocation(); } - public BlockBrokenMessage(boolean blockHit, BlockPos blockPos, Direction sideHit, Vector3d hitVec) { + public BlockBrokenMessage(boolean blockHit, BlockPos blockPos, Direction sideHit, Vec3 hitVec) { this.blockHit = blockHit; this.blockPos = blockPos; this.sideHit = sideHit; this.hitVec = hitVec; } - public static void encode(BlockBrokenMessage message, PacketBuffer buf) { + public static void encode(BlockBrokenMessage message, FriendlyByteBuf buf) { buf.writeBoolean(message.blockHit); buf.writeInt(message.blockPos.getX()); buf.writeInt(message.blockPos.getY()); @@ -54,11 +54,11 @@ public class BlockBrokenMessage { buf.writeDouble(message.hitVec.z); } - public static BlockBrokenMessage decode(PacketBuffer buf) { + public static BlockBrokenMessage decode(FriendlyByteBuf buf) { boolean blockHit = buf.readBoolean(); BlockPos blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt()); Direction sideHit = Direction.from3DDataValue(buf.readInt()); - Vector3d hitVec = new Vector3d(buf.readDouble(), buf.readDouble(), buf.readDouble()); + Vec3 hitVec = new Vec3(buf.readDouble(), buf.readDouble(), buf.readDouble()); return new BlockBrokenMessage(blockHit, blockPos, sideHit, hitVec); } @@ -74,7 +74,7 @@ public class BlockBrokenMessage { return sideHit; } - public Vector3d getHitVec() { + public Vec3 getHitVec() { return hitVec; } diff --git a/src/main/java/nl/requios/effortlessbuilding/network/BlockPlacedMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/BlockPlacedMessage.java index ef384da..77fbdcb 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/BlockPlacedMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/BlockPlacedMessage.java @@ -1,11 +1,11 @@ package nl.requios.effortlessbuilding.network; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.Direction; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.core.Direction; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.fml.network.NetworkEvent; import nl.requios.effortlessbuilding.buildmode.BuildModes; @@ -22,26 +22,26 @@ public class BlockPlacedMessage { private final boolean blockHit; private final BlockPos blockPos; private final Direction sideHit; - private final Vector3d hitVec; + private final Vec3 hitVec; private final boolean placeStartPos; //prevent double placing in normal mode public BlockPlacedMessage() { this.blockHit = false; this.blockPos = BlockPos.ZERO; this.sideHit = Direction.UP; - this.hitVec = new Vector3d(0, 0, 0); + this.hitVec = new Vec3(0, 0, 0); this.placeStartPos = true; } - public BlockPlacedMessage(BlockRayTraceResult result, boolean placeStartPos) { - this.blockHit = result.getType() == RayTraceResult.Type.BLOCK; + public BlockPlacedMessage(BlockHitResult result, boolean placeStartPos) { + this.blockHit = result.getType() == HitResult.Type.BLOCK; this.blockPos = result.getBlockPos(); this.sideHit = result.getDirection(); this.hitVec = result.getLocation(); this.placeStartPos = placeStartPos; } - public BlockPlacedMessage(boolean blockHit, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean placeStartPos) { + public BlockPlacedMessage(boolean blockHit, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean placeStartPos) { this.blockHit = blockHit; this.blockPos = blockPos; this.sideHit = sideHit; @@ -49,7 +49,7 @@ public class BlockPlacedMessage { this.placeStartPos = placeStartPos; } - public static void encode(BlockPlacedMessage message, PacketBuffer buf) { + public static void encode(BlockPlacedMessage message, FriendlyByteBuf buf) { buf.writeBoolean(message.blockHit); buf.writeInt(message.blockPos.getX()); buf.writeInt(message.blockPos.getY()); @@ -61,11 +61,11 @@ public class BlockPlacedMessage { buf.writeBoolean(message.placeStartPos); } - public static BlockPlacedMessage decode(PacketBuffer buf) { + public static BlockPlacedMessage decode(FriendlyByteBuf buf) { boolean blockHit = buf.readBoolean(); BlockPos blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt()); Direction sideHit = Direction.from3DDataValue(buf.readInt()); - Vector3d hitVec = new Vector3d(buf.readDouble(), buf.readDouble(), buf.readDouble()); + Vec3 hitVec = new Vec3(buf.readDouble(), buf.readDouble(), buf.readDouble()); boolean placeStartPos = buf.readBoolean(); return new BlockPlacedMessage(blockHit, blockPos, sideHit, hitVec, placeStartPos); } @@ -82,7 +82,7 @@ public class BlockPlacedMessage { return sideHit; } - public Vector3d getHitVec() { + public Vec3 getHitVec() { return hitVec; } diff --git a/src/main/java/nl/requios/effortlessbuilding/network/CancelModeMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/CancelModeMessage.java index b64dd50..0b7a4cc 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/CancelModeMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/CancelModeMessage.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.network; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.fml.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmode.BuildModes; @@ -13,17 +13,17 @@ import java.util.function.Supplier; */ public class CancelModeMessage { - public static void encode(CancelModeMessage message, PacketBuffer buf) { + public static void encode(CancelModeMessage message, FriendlyByteBuf buf) { } - public static CancelModeMessage decode(PacketBuffer buf) { + public static CancelModeMessage decode(FriendlyByteBuf buf) { return new CancelModeMessage(); } public static class Handler { public static void handle(CancelModeMessage message, Supplier ctx) { ctx.get().enqueueWork(() -> { - PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); + Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); BuildModes.initializeMode(player); }); diff --git a/src/main/java/nl/requios/effortlessbuilding/network/ClearUndoMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/ClearUndoMessage.java index e0551d8..16cee48 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/ClearUndoMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/ClearUndoMessage.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.network; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.fml.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -17,11 +17,11 @@ public class ClearUndoMessage { public ClearUndoMessage() { } - public static void encode(ClearUndoMessage message, PacketBuffer buf) { + public static void encode(ClearUndoMessage message, FriendlyByteBuf buf) { } - public static ClearUndoMessage decode(PacketBuffer buf) { + public static ClearUndoMessage decode(FriendlyByteBuf buf) { return new ClearUndoMessage(); } @@ -30,7 +30,7 @@ public class ClearUndoMessage { ctx.get().enqueueWork(() -> { if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) { //Received clientside - PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); + Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); //Add to undo stack clientside UndoRedo.clear(player); diff --git a/src/main/java/nl/requios/effortlessbuilding/network/ModeActionMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/ModeActionMessage.java index 1aaee67..c972331 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/ModeActionMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/ModeActionMessage.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.network; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.fml.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmode.ModeOptions; @@ -22,11 +22,11 @@ public class ModeActionMessage { this.action = action; } - public static void encode(ModeActionMessage message, PacketBuffer buf) { + public static void encode(ModeActionMessage message, FriendlyByteBuf buf) { buf.writeInt(message.action.ordinal()); } - public static ModeActionMessage decode(PacketBuffer buf) { + public static ModeActionMessage decode(FriendlyByteBuf buf) { ModeOptions.ActionEnum action = ModeOptions.ActionEnum.values()[buf.readInt()]; return new ModeActionMessage(action); } @@ -34,7 +34,7 @@ public class ModeActionMessage { public static class Handler { public static void handle(ModeActionMessage message, Supplier ctx) { ctx.get().enqueueWork(() -> { - PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); + Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); ModeOptions.performAction(player, message.action); }); diff --git a/src/main/java/nl/requios/effortlessbuilding/network/ModeSettingsMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/ModeSettingsMessage.java index c0dd02e..18e29c2 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/ModeSettingsMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/ModeSettingsMessage.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.network; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.fml.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmode.BuildModes; @@ -24,11 +24,11 @@ public class ModeSettingsMessage { this.modeSettings = modeSettings; } - public static void encode(ModeSettingsMessage message, PacketBuffer buf) { + public static void encode(ModeSettingsMessage message, FriendlyByteBuf buf) { buf.writeInt(message.modeSettings.getBuildMode().ordinal()); } - public static ModeSettingsMessage decode(PacketBuffer buf) { + public static ModeSettingsMessage decode(FriendlyByteBuf buf) { BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[buf.readInt()]; return new ModeSettingsMessage(new ModeSettings(buildMode)); @@ -37,7 +37,7 @@ public class ModeSettingsMessage { public static class Handler { public static void handle(ModeSettingsMessage message, Supplier ctx) { ctx.get().enqueueWork(() -> { - PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); + Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); // Sanitize ModeSettingsManager.sanitize(message.modeSettings, player); diff --git a/src/main/java/nl/requios/effortlessbuilding/network/ModifierSettingsMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/ModifierSettingsMessage.java index 5260c9d..abf5451 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/ModifierSettingsMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/ModifierSettingsMessage.java @@ -1,9 +1,9 @@ package nl.requios.effortlessbuilding.network; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.world.entity.player.Player; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.fml.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.buildmodifier.Array; @@ -31,7 +31,7 @@ public class ModifierSettingsMessage { this.modifierSettings = modifierSettings; } - public static void encode(ModifierSettingsMessage message, PacketBuffer buf) { + public static void encode(ModifierSettingsMessage message, FriendlyByteBuf buf) { //MIRROR Mirror.MirrorSettings m = message.modifierSettings.getMirrorSettings(); buf.writeBoolean(m != null); @@ -79,12 +79,12 @@ public class ModifierSettingsMessage { } } - public static ModifierSettingsMessage decode(PacketBuffer buf) { + public static ModifierSettingsMessage decode(FriendlyByteBuf buf) { //MIRROR Mirror.MirrorSettings m = new Mirror.MirrorSettings(); if (buf.readBoolean()) { boolean mirrorEnabled = buf.readBoolean(); - Vector3d mirrorPosition = new Vector3d(buf.readDouble(), buf.readDouble(), buf.readDouble()); + Vec3 mirrorPosition = new Vec3(buf.readDouble(), buf.readDouble(), buf.readDouble()); boolean mirrorX = buf.readBoolean(); boolean mirrorY = buf.readBoolean(); boolean mirrorZ = buf.readBoolean(); @@ -112,7 +112,7 @@ public class ModifierSettingsMessage { RadialMirror.RadialMirrorSettings r = new RadialMirror.RadialMirrorSettings(); if (buf.readBoolean()) { boolean radialMirrorEnabled = buf.readBoolean(); - Vector3d radialMirrorPosition = new Vector3d(buf.readDouble(), buf.readDouble(), buf.readDouble()); + Vec3 radialMirrorPosition = new Vec3(buf.readDouble(), buf.readDouble(), buf.readDouble()); int radialMirrorSlices = buf.readInt(); boolean radialMirrorAlternate = buf.readBoolean(); int radialMirrorRadius = buf.readInt(); @@ -129,7 +129,7 @@ public class ModifierSettingsMessage { public static class Handler { public static void handle(ModifierSettingsMessage message, Supplier ctx) { ctx.get().enqueueWork(() -> { - PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); + Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); // Sanitize ModifierSettingsManager.sanitize(message.modifierSettings, player); diff --git a/src/main/java/nl/requios/effortlessbuilding/network/PacketHandler.java b/src/main/java/nl/requios/effortlessbuilding/network/PacketHandler.java index 90e05ce..96f6cb3 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/PacketHandler.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/PacketHandler.java @@ -1,6 +1,6 @@ package nl.requios.effortlessbuilding.network; -import net.minecraft.util.ResourceLocation; +import net.minecraft.resources.ResourceLocation; import net.minecraftforge.fml.network.NetworkRegistry; import net.minecraftforge.fml.network.simple.SimpleChannel; import nl.requios.effortlessbuilding.EffortlessBuilding; diff --git a/src/main/java/nl/requios/effortlessbuilding/network/RequestLookAtMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/RequestLookAtMessage.java index bfcc1d7..4ef069f 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/RequestLookAtMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/RequestLookAtMessage.java @@ -1,9 +1,9 @@ package nl.requios.effortlessbuilding.network; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceResult; +import net.minecraft.world.entity.player.Player; +import net.minecraft.network.FriendlyByteBuf; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.phys.HitResult; import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.fml.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -26,11 +26,11 @@ public class RequestLookAtMessage { this.placeStartPos = placeStartPos; } - public static void encode(RequestLookAtMessage message, PacketBuffer buf) { + public static void encode(RequestLookAtMessage message, FriendlyByteBuf buf) { buf.writeBoolean(message.placeStartPos); } - public static RequestLookAtMessage decode(PacketBuffer buf) { + public static RequestLookAtMessage decode(FriendlyByteBuf buf) { boolean placeStartPos = buf.readBoolean(); return new RequestLookAtMessage(placeStartPos); } @@ -45,12 +45,12 @@ public class RequestLookAtMessage { if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) { //Received clientside //Send back your info - PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); + Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); //Prevent double placing in normal mode with placeStartPos false //Unless QuickReplace is on, then we do need to place start pos. - if (ClientProxy.previousLookAt.getType() == RayTraceResult.Type.BLOCK) { - PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage((BlockRayTraceResult) ClientProxy.previousLookAt, message.getPlaceStartPos())); + if (ClientProxy.previousLookAt.getType() == HitResult.Type.BLOCK) { + PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage((BlockHitResult) ClientProxy.previousLookAt, message.getPlaceStartPos())); } else { PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage()); } diff --git a/src/main/java/nl/requios/effortlessbuilding/network/TranslatedLogMessage.java b/src/main/java/nl/requios/effortlessbuilding/network/TranslatedLogMessage.java index ff891b3..3742199 100644 --- a/src/main/java/nl/requios/effortlessbuilding/network/TranslatedLogMessage.java +++ b/src/main/java/nl/requios/effortlessbuilding/network/TranslatedLogMessage.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.network; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.network.PacketBuffer; +import net.minecraft.world.entity.player.Player; +import net.minecraft.network.FriendlyByteBuf; import net.minecraftforge.fml.LogicalSide; import net.minecraftforge.fml.network.NetworkEvent; import nl.requios.effortlessbuilding.EffortlessBuilding; @@ -28,14 +28,14 @@ public class TranslatedLogMessage { this.actionBar = actionBar; } - public static void encode(TranslatedLogMessage message, PacketBuffer buf) { + public static void encode(TranslatedLogMessage message, FriendlyByteBuf buf) { buf.writeUtf(message.prefix); buf.writeUtf(message.translationKey); buf.writeUtf(message.suffix); buf.writeBoolean(message.actionBar); } - public static TranslatedLogMessage decode(PacketBuffer buf) { + public static TranslatedLogMessage decode(FriendlyByteBuf buf) { return new TranslatedLogMessage(buf.readUtf(), buf.readUtf(), buf.readUtf(), buf.readBoolean()); } @@ -61,7 +61,7 @@ public class TranslatedLogMessage { if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) { //Received clientside - PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); + Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx); EffortlessBuilding.logTranslate(player, message.prefix, message.translationKey, message.suffix, message.actionBar); } }); diff --git a/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java b/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java index 5b2e437..c7d3add 100644 --- a/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java +++ b/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java @@ -1,27 +1,27 @@ package nl.requios.effortlessbuilding.proxy; import mcp.MethodsReturnNonnullByDefault; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.SoundType; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.gui.ScreenManager; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.resources.I18n; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.client.util.InputMappings; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.BlockItem; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Hand; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.RayTraceContext; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.vector.Vector3d; -import net.minecraft.util.text.TextFormatting; -import net.minecraft.world.World; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.client.gui.screens.MenuScreens; +import net.minecraft.client.gui.screens.Screen; +import net.minecraft.client.resources.language.I18n; +import net.minecraft.client.KeyMapping; +import com.mojang.blaze3d.platform.InputConstants; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.InteractionHand; +import net.minecraft.sounds.SoundSource; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.world.level.ClipContext; +import net.minecraft.world.phys.HitResult; +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.event.GuiOpenEvent; import net.minecraftforge.client.event.InputEvent; @@ -58,9 +58,9 @@ import java.util.function.Supplier; @ParametersAreNonnullByDefault @MethodsReturnNonnullByDefault public class ClientProxy implements IProxy { - public static KeyBinding[] keyBindings; - public static RayTraceResult previousLookAt; - public static RayTraceResult currentLookAt; + public static KeyMapping[] keyBindings; + public static HitResult previousLookAt; + public static HitResult currentLookAt; public static int ticksInGame = 0; private static int placeCooldown = 0; private static int breakCooldown = 0; @@ -73,7 +73,7 @@ public class ClientProxy implements IProxy { onMouseInput(); //Update previousLookAt - RayTraceResult objectMouseOver = Minecraft.getInstance().hitResult; + HitResult objectMouseOver = Minecraft.getInstance().hitResult; //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS) if (objectMouseOver == null) return; @@ -83,12 +83,12 @@ public class ClientProxy implements IProxy { return; } - if (objectMouseOver.getType() == RayTraceResult.Type.BLOCK) { - if (currentLookAt.getType() != RayTraceResult.Type.BLOCK) { + if (objectMouseOver.getType() == HitResult.Type.BLOCK) { + if (currentLookAt.getType() != HitResult.Type.BLOCK) { currentLookAt = objectMouseOver; previousLookAt = objectMouseOver; } else { - if (((BlockRayTraceResult) currentLookAt).getBlockPos() != ((BlockRayTraceResult) objectMouseOver).getBlockPos()) { + if (((BlockHitResult) currentLookAt).getBlockPos() != ((BlockHitResult) objectMouseOver).getBlockPos()) { previousLookAt = currentLookAt; currentLookAt = objectMouseOver; } @@ -112,7 +112,7 @@ public class ClientProxy implements IProxy { private static void onMouseInput() { Minecraft mc = Minecraft.getInstance(); - ClientPlayerEntity player = mc.player; + LocalPlayer player = mc.player; if (player == null) return; BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode(); @@ -129,16 +129,16 @@ public class ClientProxy implements IProxy { if (placeCooldown <= 0) { placeCooldown = 4; - ItemStack currentItemStack = player.getItemInHand(Hand.MAIN_HAND); + ItemStack currentItemStack = player.getItemInHand(InteractionHand.MAIN_HAND); if (currentItemStack.getItem() instanceof BlockItem || (CompatHelper.isItemBlockProxy(currentItemStack) && !player.isShiftKeyDown())) { ItemStack itemStack = CompatHelper.getItemBlockFromStack(currentItemStack); //find position in distance - RayTraceResult lookingAt = getLookingAt(player); - if (lookingAt != null && lookingAt.getType() == RayTraceResult.Type.BLOCK) { - BlockRayTraceResult blockLookingAt = (BlockRayTraceResult) lookingAt; + HitResult lookingAt = getLookingAt(player); + if (lookingAt != null && lookingAt.getType() == HitResult.Type.BLOCK) { + BlockHitResult blockLookingAt = (BlockHitResult) lookingAt; BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage(blockLookingAt, true)); PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage(blockLookingAt, true)); @@ -150,9 +150,9 @@ public class ClientProxy implements IProxy { BlockState state = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState(); BlockPos blockPos = blockLookingAt.getBlockPos(); SoundType soundType = state.getBlock().getSoundType(state, player.level, blockPos, player); - player.level.playSound(player, player.blockPosition(), soundType.getPlaceSound(), SoundCategory.BLOCKS, + player.level.playSound(player, player.blockPosition(), soundType.getPlaceSound(), SoundSource.BLOCKS, 0.4f, soundType.getPitch()); - player.swing(Hand.MAIN_HAND); + player.swing(InteractionHand.MAIN_HAND); } } else { BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage()); @@ -179,9 +179,9 @@ public class ClientProxy implements IProxy { // moving it to after buildmodes fixes that, but introduces this bug if (!ReachHelper.canBreakFar(player)) return; - RayTraceResult lookingAt = getLookingAt(player); - if (lookingAt != null && lookingAt.getType() == RayTraceResult.Type.BLOCK) { - BlockRayTraceResult blockLookingAt = (BlockRayTraceResult) lookingAt; + HitResult lookingAt = getLookingAt(player); + if (lookingAt != null && lookingAt.getType() == HitResult.Type.BLOCK) { + BlockHitResult blockLookingAt = (BlockHitResult) lookingAt; BuildModes.onBlockBrokenMessage(player, new BlockBrokenMessage(blockLookingAt)); PacketHandler.INSTANCE.sendToServer(new BlockBrokenMessage(blockLookingAt)); @@ -192,9 +192,9 @@ public class ClientProxy implements IProxy { BlockPos blockPos = blockLookingAt.getBlockPos(); BlockState state = player.level.getBlockState(blockPos); SoundType soundtype = state.getBlock().getSoundType(state, player.level, blockPos, player); - player.level.playSound(player, player.blockPosition(), soundtype.getBreakSound(), SoundCategory.BLOCKS, + player.level.playSound(player, player.blockPosition(), soundtype.getBreakSound(), SoundSource.BLOCKS, 0.4f, soundtype.getPitch()); - player.swing(Hand.MAIN_HAND); + player.swing(InteractionHand.MAIN_HAND); } } else { BuildModes.onBlockBrokenMessage(player, new BlockBrokenMessage()); @@ -214,7 +214,7 @@ public class ClientProxy implements IProxy { @SubscribeEvent(receiveCanceled = true) public static void onKeyPress(InputEvent.KeyInputEvent event) { - ClientPlayerEntity player = Minecraft.getInstance().player; + LocalPlayer player = Minecraft.getInstance().player; if (player == null) return; @@ -228,7 +228,7 @@ public class ClientProxy implements IProxy { if (keyBindings[1].consumeClick()) { ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace()); - EffortlessBuilding.log(player, "Set " + TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + ( + EffortlessBuilding.log(player, "Set " + ChatFormatting.GOLD + "Quick Replace " + ChatFormatting.RESET + ( modifierSettings.doQuickReplace() ? "on" : "off")); PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings)); } @@ -284,7 +284,7 @@ public class ClientProxy implements IProxy { public static void openModifierSettings() { Minecraft mc = Minecraft.getInstance(); - ClientPlayerEntity player = mc.player; + LocalPlayer player = mc.player; if (player == null) return; @@ -304,7 +304,7 @@ public class ClientProxy implements IProxy { public static void openPlayerSettings() { Minecraft mc = Minecraft.getInstance(); - ClientPlayerEntity player = mc.player; + LocalPlayer player = mc.player; if (player == null) return; @@ -320,24 +320,24 @@ public class ClientProxy implements IProxy { @SubscribeEvent public static void onGuiOpen(GuiOpenEvent event) { - PlayerEntity player = Minecraft.getInstance().player; + Player player = Minecraft.getInstance().player; if (player != null) { BuildModes.initializeMode(player); } } - public static RayTraceResult getLookingAt(PlayerEntity player) { - World world = player.level; + public static HitResult getLookingAt(Player player) { + Level world = player.level; //base distance off of player ability (config) float raytraceRange = ReachHelper.getPlacementReach(player); - Vector3d look = player.getLookAngle(); - Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ()); - Vector3d end = new Vector3d(player.getX() + look.x * raytraceRange, player.getY() + player.getEyeHeight() + look.y * raytraceRange, player.getZ() + look.z * raytraceRange); + Vec3 look = player.getLookAngle(); + Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ()); + Vec3 end = new Vec3(player.getX() + look.x * raytraceRange, player.getY() + player.getEyeHeight() + look.y * raytraceRange, player.getZ() + look.z * raytraceRange); // return player.rayTrace(raytraceRange, 1f, RayTraceFluidMode.NEVER); //TODO 1.14 check if correct - return world.clip(new RayTraceContext(start, end, RayTraceContext.BlockMode.COLLIDER, RayTraceContext.FluidMode.NONE, player)); + return world.clip(new ClipContext(start, end, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, player)); } @Override @@ -347,40 +347,40 @@ public class ClientProxy implements IProxy { @Override public void clientSetup(FMLClientSetupEvent event) { // register key bindings - keyBindings = new KeyBinding[7]; + keyBindings = new KeyMapping[7]; // instantiate the key bindings - keyBindings[0] = new KeyBinding("key.effortlessbuilding.hud.desc", KeyConflictContext.UNIVERSAL, InputMappings.getKey(GLFW.GLFW_KEY_KP_ADD, 0), "key.effortlessbuilding.category"); - keyBindings[1] = new KeyBinding("key.effortlessbuilding.replace.desc", KeyConflictContext.IN_GAME, InputMappings.getKey(GLFW.GLFW_KEY_KP_SUBTRACT, 0), "key.effortlessbuilding.category"); - keyBindings[2] = new KeyBinding("key.effortlessbuilding.creative.desc", KeyConflictContext.IN_GAME, InputMappings.getKey(GLFW.GLFW_KEY_F4, 0), "key.effortlessbuilding.category"); - keyBindings[3] = new KeyBinding("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, InputMappings.getKey(GLFW.GLFW_KEY_LEFT_ALT, 0), "key.effortlessbuilding.category") { + keyBindings[0] = new KeyMapping("key.effortlessbuilding.hud.desc", KeyConflictContext.UNIVERSAL, InputConstants.getKey(GLFW.GLFW_KEY_KP_ADD, 0), "key.effortlessbuilding.category"); + keyBindings[1] = new KeyMapping("key.effortlessbuilding.replace.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_SUBTRACT, 0), "key.effortlessbuilding.category"); + keyBindings[2] = new KeyMapping("key.effortlessbuilding.creative.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_F4, 0), "key.effortlessbuilding.category"); + keyBindings[3] = new KeyMapping("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_ALT, 0), "key.effortlessbuilding.category") { @Override - public boolean same(KeyBinding other) { + public boolean same(KeyMapping other) { //Does not conflict with Chisels and Bits radial menu if (other.getKey().getValue() == getKey().getValue() && other.getName().equals("mod.chiselsandbits.other.mode")) return false; return super.same(other); } }; - keyBindings[4] = new KeyBinding("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputMappings.getKey(GLFW.GLFW_KEY_Z, 0), "key.effortlessbuilding.category"); - keyBindings[5] = new KeyBinding("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputMappings.getKey(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category"); - keyBindings[6] = new KeyBinding("key.effortlessbuilding.altplacement.desc", KeyConflictContext.IN_GAME, InputMappings.getKey(GLFW.GLFW_KEY_LEFT_CONTROL, 0), "key.effortlessbuilding.category"); + keyBindings[4] = new KeyMapping("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Z, 0), "key.effortlessbuilding.category"); + keyBindings[5] = new KeyMapping("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category"); + keyBindings[6] = new KeyMapping("key.effortlessbuilding.altplacement.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_CONTROL, 0), "key.effortlessbuilding.category"); //keyBindings[7] = new KeyBinding("Reload shaders", KeyConflictContext.UNIVERSAL, InputMappings.getInputByCode(GLFW.GLFW_KEY_TAB, 0), "key.effortlessbuilding.category"); // register all the key bindings - for (KeyBinding keyBinding : keyBindings) { + for (KeyMapping keyBinding : keyBindings) { ClientRegistry.registerKeyBinding(keyBinding); } - DeferredWorkQueue.runLater(() -> ScreenManager.register(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER.get(), RandomizerBagScreen::new)); + DeferredWorkQueue.runLater(() -> MenuScreens.register(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER.get(), RandomizerBagScreen::new)); } - public PlayerEntity getPlayerEntityFromContext(Supplier ctx) { + public Player getPlayerEntityFromContext(Supplier ctx) { return (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT ? Minecraft.getInstance().player : ctx.get().getSender()); } @Override - public void logTranslate(PlayerEntity player, String prefix, String translationKey, String suffix, boolean actionBar) { + public void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar) { EffortlessBuilding.log(Minecraft.getInstance().player, prefix + I18n.get(translationKey) + suffix, actionBar); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/proxy/IProxy.java b/src/main/java/nl/requios/effortlessbuilding/proxy/IProxy.java index 3a825de..462da00 100644 --- a/src/main/java/nl/requios/effortlessbuilding/proxy/IProxy.java +++ b/src/main/java/nl/requios/effortlessbuilding/proxy/IProxy.java @@ -1,6 +1,6 @@ package nl.requios.effortlessbuilding.proxy; -import net.minecraft.entity.player.PlayerEntity; +import net.minecraft.world.entity.player.Player; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.network.NetworkEvent; @@ -12,7 +12,7 @@ public interface IProxy { void clientSetup(final FMLClientSetupEvent event); - PlayerEntity getPlayerEntityFromContext(Supplier ctx); + Player getPlayerEntityFromContext(Supplier ctx); - void logTranslate(PlayerEntity player, String prefix, String translationKey, String suffix, boolean actionBar); + void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar); } diff --git a/src/main/java/nl/requios/effortlessbuilding/proxy/ServerProxy.java b/src/main/java/nl/requios/effortlessbuilding/proxy/ServerProxy.java index 09f4cdd..8a22bc6 100644 --- a/src/main/java/nl/requios/effortlessbuilding/proxy/ServerProxy.java +++ b/src/main/java/nl/requios/effortlessbuilding/proxy/ServerProxy.java @@ -1,7 +1,7 @@ package nl.requios.effortlessbuilding.proxy; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.entity.player.ServerPlayerEntity; +import net.minecraft.world.entity.player.Player; +import net.minecraft.server.level.ServerPlayer; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent; import net.minecraftforge.fml.network.NetworkEvent; @@ -22,12 +22,12 @@ public class ServerProxy implements IProxy { public void clientSetup(FMLClientSetupEvent event) { } - public PlayerEntity getPlayerEntityFromContext(Supplier ctx) { + public Player getPlayerEntityFromContext(Supplier ctx) { return ctx.get().getSender(); } @Override - public void logTranslate(PlayerEntity player, String prefix, String translationKey, String suffix, boolean actionBar) { - PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new TranslatedLogMessage(prefix, translationKey, suffix, actionBar)); + public void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar) { + PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new TranslatedLogMessage(prefix, translationKey, suffix, actionBar)); } } diff --git a/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviewRenderer.java b/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviewRenderer.java index d3fa858..7cd5309 100644 --- a/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviewRenderer.java +++ b/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviewRenderer.java @@ -1,23 +1,23 @@ package nl.requios.effortlessbuilding.render; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.block.BlockState; -import net.minecraft.block.SoundType; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.block.SoundType; import net.minecraft.client.Minecraft; -import net.minecraft.client.entity.player.ClientPlayerEntity; -import net.minecraft.client.renderer.BlockRendererDispatcher; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.item.ItemStack; -import net.minecraft.util.Direction; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.BlockRayTraceResult; -import net.minecraft.util.math.MathHelper; -import net.minecraft.util.math.RayTraceResult; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.client.player.LocalPlayer; +import net.minecraft.client.renderer.block.BlockRenderDispatcher; +import net.minecraft.client.renderer.MultiBufferSource; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.item.ItemStack; +import net.minecraft.core.Direction; +import net.minecraft.sounds.SoundSource; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.BlockHitResult; +import net.minecraft.util.Mth; +import net.minecraft.world.phys.HitResult; +import net.minecraft.world.phys.shapes.VoxelShape; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import nl.requios.effortlessbuilding.BuildConfig; @@ -49,7 +49,7 @@ public class BlockPreviewRenderer { private static BlockPos previousSecondPos; private static int soundTime = 0; - public static void render(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, PlayerEntity player, ModifierSettings modifierSettings, ModeSettings modeSettings) { + public static void render(PoseStack matrixStack, MultiBufferSource.BufferSource renderTypeBuffer, Player player, ModifierSettings modifierSettings, ModeSettings modeSettings) { //Render placed blocks with dissolve effect //Use fancy shader if config allows, otherwise no dissolve @@ -58,7 +58,7 @@ public class BlockPreviewRenderer { PlacedData placed = placedDataList.get(i); if (placed.coordinates != null && !placed.coordinates.isEmpty()) { - double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distSqr(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier.get(); + double totalTime = Mth.clampedLerp(30, 60, placed.firstPos.distSqr(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier.get(); float dissolve = (ClientProxy.ticksInGame - placed.time) / (float) totalTime; renderBlockPreviews(matrixStack, renderTypeBuffer, placed.coordinates, placed.blockStates, placed.itemStacks, dissolve, placed.firstPos, placed.secondPos, false, placed.breaking); } @@ -66,12 +66,12 @@ public class BlockPreviewRenderer { } //Expire placedDataList.removeIf(placed -> { - double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distSqr(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier.get(); + double totalTime = Mth.clampedLerp(30, 60, placed.firstPos.distSqr(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier.get(); return placed.time + totalTime < ClientProxy.ticksInGame; }); //Render block previews - RayTraceResult lookingAt = ClientProxy.getLookingAt(player); + HitResult lookingAt = ClientProxy.getLookingAt(player); if (modeSettings.getBuildMode() == BuildModes.BuildModeEnum.NORMAL) lookingAt = Minecraft.getInstance().hitResult; @@ -80,11 +80,11 @@ public class BlockPreviewRenderer { BlockPos startPos = null; Direction sideHit = null; - Vector3d hitVec = null; + Vec3 hitVec = null; //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS) - if (lookingAt != null && lookingAt.getType() == RayTraceResult.Type.BLOCK) { - BlockRayTraceResult blockLookingAt = (BlockRayTraceResult) lookingAt; + if (lookingAt != null && lookingAt.getType() == HitResult.Type.BLOCK) { + BlockHitResult blockLookingAt = (BlockHitResult) lookingAt; startPos = blockLookingAt.getBlockPos(); //Check if tool (or none) in hand @@ -141,7 +141,7 @@ public class BlockPreviewRenderer { sortOnDistanceToPlayer(newCoordinates, player); - hitVec = new Vector3d(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), + hitVec = new Vec3(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), Math.abs(hitVec.z - ((int) hitVec.z))); //Get blockstates @@ -177,7 +177,7 @@ public class BlockPreviewRenderer { SoundType soundType = blockStates.get(0).getBlock().getSoundType(blockStates.get(0), player.level, newCoordinates.get(0), player); player.level.playSound(player, player.blockPosition(), breaking ? soundType.getBreakSound() : soundType.getPlaceSound(), - SoundCategory.BLOCKS, 0.3f, 0.8f); + SoundSource.BLOCKS, 0.3f, 0.8f); } } } @@ -190,10 +190,10 @@ public class BlockPreviewRenderer { if (BuildConfig.visuals.useShaders.get() && newCoordinates.size() < BuildConfig.visuals.shaderTreshold.get()) { blockCount = renderBlockPreviews(matrixStack, renderTypeBuffer, newCoordinates, blockStates, itemStacks, 0f, firstPos, secondPos, !breaking, breaking); } else { - IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer); + VertexConsumer buffer = RenderHandler.beginLines(renderTypeBuffer); - Vector3d color = new Vector3d(1f, 1f, 1f); - if (breaking) color = new Vector3d(1f, 0f, 0f); + Vec3 color = new Vec3(1f, 1f, 1f); + if (breaking) color = new Vec3(1f, 0f, 0f); for (int i = newCoordinates.size() - 1; i >= 0; i--) { VoxelShape collisionShape = blockStates.get(i).getCollisionShape(player.level, newCoordinates.get(i)); @@ -236,17 +236,17 @@ public class BlockPreviewRenderer { } - IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer); + VertexConsumer buffer = RenderHandler.beginLines(renderTypeBuffer); //Draw outlines if tool in hand //Find proper raytrace: either normal range or increased range depending on canBreakFar - RayTraceResult objectMouseOver = Minecraft.getInstance().hitResult; - RayTraceResult breakingRaytrace = ReachHelper.canBreakFar(player) ? lookingAt : objectMouseOver; - if (toolInHand && breakingRaytrace != null && breakingRaytrace.getType() == RayTraceResult.Type.BLOCK) { - BlockRayTraceResult blockBreakingRaytrace = (BlockRayTraceResult) breakingRaytrace; + HitResult objectMouseOver = Minecraft.getInstance().hitResult; + HitResult breakingRaytrace = ReachHelper.canBreakFar(player) ? lookingAt : objectMouseOver; + if (toolInHand && breakingRaytrace != null && breakingRaytrace.getType() == HitResult.Type.BLOCK) { + BlockHitResult blockBreakingRaytrace = (BlockHitResult) breakingRaytrace; List breakCoordinates = BuildModifiers.findCoordinates(player, blockBreakingRaytrace.getBlockPos()); //Only render first outline if further than normal reach - boolean excludeFirst = objectMouseOver != null && objectMouseOver.getType() == RayTraceResult.Type.BLOCK; + boolean excludeFirst = objectMouseOver != null && objectMouseOver.getType() == HitResult.Type.BLOCK; for (int i = excludeFirst ? 1 : 0; i < breakCoordinates.size(); i++) { BlockPos coordinate = breakCoordinates.get(i); @@ -254,7 +254,7 @@ public class BlockPreviewRenderer { if (!blockState.getBlock().isAir(blockState, player.level, coordinate)) { if (SurvivalHelper.canBreak(player.level, player, coordinate) || i == 0) { VoxelShape collisionShape = blockState.getCollisionShape(player.level, coordinate); - RenderHandler.renderBlockOutline(matrixStack, buffer, coordinate, collisionShape, new Vector3d(0f, 0f, 0f)); + RenderHandler.renderBlockOutline(matrixStack, buffer, coordinate, collisionShape, new Vec3(0f, 0f, 0f)); } } } @@ -270,12 +270,12 @@ public class BlockPreviewRenderer { BuildConfig.visuals.alwaysShowBlockPreview.get(); } - protected static int renderBlockPreviews(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, List coordinates, List blockStates, + protected static int renderBlockPreviews(PoseStack matrixStack, MultiBufferSource.BufferSource renderTypeBuffer, List coordinates, List blockStates, List itemStacks, float dissolve, BlockPos firstPos, BlockPos secondPos, boolean checkCanPlace, boolean red) { - PlayerEntity player = Minecraft.getInstance().player; + Player player = Minecraft.getInstance().player; ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); - BlockRendererDispatcher dispatcher = Minecraft.getInstance().getBlockRenderer(); + BlockRenderDispatcher dispatcher = Minecraft.getInstance().getBlockRenderer(); int blocksValid = 0; if (coordinates.isEmpty()) return blocksValid; @@ -305,7 +305,7 @@ public class BlockPreviewRenderer { public static void onBlocksPlaced(List coordinates, List itemStacks, List blockStates, BlockPos firstPos, BlockPos secondPos) { - ClientPlayerEntity player = Minecraft.getInstance().player; + LocalPlayer player = Minecraft.getInstance().player; ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player); @@ -329,7 +329,7 @@ public class BlockPreviewRenderer { public static void onBlocksBroken(List coordinates, List itemStacks, List blockStates, BlockPos firstPos, BlockPos secondPos) { - ClientPlayerEntity player = Minecraft.getInstance().player; + LocalPlayer player = Minecraft.getInstance().player; ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player); @@ -349,12 +349,12 @@ public class BlockPreviewRenderer { } - private static void sortOnDistanceToPlayer(List coordinates, PlayerEntity player) { + private static void sortOnDistanceToPlayer(List coordinates, Player player) { Collections.sort(coordinates, (lhs, rhs) -> { // -1 - less than, 1 - greater than, 0 - equal - double lhsDistanceToPlayer = Vector3d.atLowerCornerOf(lhs).subtract(player.getEyePosition(1f)).lengthSqr(); - double rhsDistanceToPlayer = Vector3d.atLowerCornerOf(rhs).subtract(player.getEyePosition(1f)).lengthSqr(); + double lhsDistanceToPlayer = Vec3.atLowerCornerOf(lhs).subtract(player.getEyePosition(1f)).lengthSqr(); + double rhsDistanceToPlayer = Vec3.atLowerCornerOf(rhs).subtract(player.getEyePosition(1f)).lengthSqr(); return (int) Math.signum(lhsDistanceToPlayer - rhsDistanceToPlayer); }); diff --git a/src/main/java/nl/requios/effortlessbuilding/render/BuildRenderTypes.java b/src/main/java/nl/requios/effortlessbuilding/render/BuildRenderTypes.java index f4021f0..30f29f0 100644 --- a/src/main/java/nl/requios/effortlessbuilding/render/BuildRenderTypes.java +++ b/src/main/java/nl/requios/effortlessbuilding/render/BuildRenderTypes.java @@ -2,12 +2,12 @@ package nl.requios.effortlessbuilding.render; import com.mojang.blaze3d.systems.RenderSystem; import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.RenderState; +import net.minecraft.client.renderer.RenderStateShard; import net.minecraft.client.renderer.RenderType; -import net.minecraft.client.renderer.texture.AtlasTexture; -import net.minecraft.client.renderer.vertex.DefaultVertexFormats; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.client.renderer.texture.TextureAtlas; +import com.mojang.blaze3d.vertex.DefaultVertexFormat; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.lwjgl.opengl.*; @@ -15,20 +15,20 @@ import java.util.OptionalDouble; import java.util.function.Consumer; public class BuildRenderTypes { - public static final RenderState.TransparencyState TRANSLUCENT_TRANSPARENCY; - public static final RenderState.TransparencyState NO_TRANSPARENCY; + public static final RenderStateShard.TransparencyStateShard TRANSLUCENT_TRANSPARENCY; + public static final RenderStateShard.TransparencyStateShard NO_TRANSPARENCY; - public static final RenderState.DiffuseLightingState DIFFUSE_LIGHTING_ENABLED; - public static final RenderState.DiffuseLightingState DIFFUSE_LIGHTING_DISABLED; + public static final RenderStateShard.DiffuseLightingStateShard DIFFUSE_LIGHTING_ENABLED; + public static final RenderStateShard.DiffuseLightingStateShard DIFFUSE_LIGHTING_DISABLED; - public static final RenderState.LayerState PROJECTION_LAYERING; + public static final RenderStateShard.LayeringStateShard PROJECTION_LAYERING; - public static final RenderState.CullState CULL_DISABLED; + public static final RenderStateShard.CullStateShard CULL_DISABLED; - public static final RenderState.AlphaState DEFAULT_ALPHA; + public static final RenderStateShard.AlphaStateShard DEFAULT_ALPHA; - public static final RenderState.WriteMaskState WRITE_TO_DEPTH_AND_COLOR; - public static final RenderState.WriteMaskState COLOR_WRITE; + public static final RenderStateShard.WriteMaskStateShard WRITE_TO_DEPTH_AND_COLOR; + public static final RenderStateShard.WriteMaskStateShard COLOR_WRITE; public static final RenderType LINES; public static final RenderType PLANES; @@ -37,25 +37,25 @@ public class BuildRenderTypes { private static final int secondaryTextureUnit = 2; static { - TRANSLUCENT_TRANSPARENCY = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "TRANSLUCENT_TRANSPARENCY"); - NO_TRANSPARENCY = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "NO_TRANSPARENCY"); + TRANSLUCENT_TRANSPARENCY = ObfuscationReflectionHelper.getPrivateValue(RenderStateShard.class, null, "TRANSLUCENT_TRANSPARENCY"); + NO_TRANSPARENCY = ObfuscationReflectionHelper.getPrivateValue(RenderStateShard.class, null, "NO_TRANSPARENCY"); - DIFFUSE_LIGHTING_ENABLED = new RenderState.DiffuseLightingState(true); - DIFFUSE_LIGHTING_DISABLED = new RenderState.DiffuseLightingState(false); + DIFFUSE_LIGHTING_ENABLED = new RenderStateShard.DiffuseLightingStateShard(true); + DIFFUSE_LIGHTING_DISABLED = new RenderStateShard.DiffuseLightingStateShard(false); - PROJECTION_LAYERING = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "VIEW_OFFSET_Z_LAYERING"); + PROJECTION_LAYERING = ObfuscationReflectionHelper.getPrivateValue(RenderStateShard.class, null, "VIEW_OFFSET_Z_LAYERING"); - CULL_DISABLED = new RenderState.CullState(false); + CULL_DISABLED = new RenderStateShard.CullStateShard(false); - DEFAULT_ALPHA = new RenderState.AlphaState(0.003921569F); + DEFAULT_ALPHA = new RenderStateShard.AlphaStateShard(0.003921569F); final boolean ENABLE_DEPTH_WRITING = true; final boolean ENABLE_COLOUR_COMPONENTS_WRITING = true; - WRITE_TO_DEPTH_AND_COLOR = new RenderState.WriteMaskState(ENABLE_COLOUR_COMPONENTS_WRITING, ENABLE_DEPTH_WRITING); - COLOR_WRITE = new RenderState.WriteMaskState(true, false); + WRITE_TO_DEPTH_AND_COLOR = new RenderStateShard.WriteMaskStateShard(ENABLE_COLOUR_COMPONENTS_WRITING, ENABLE_DEPTH_WRITING); + COLOR_WRITE = new RenderStateShard.WriteMaskStateShard(true, false); final int INITIAL_BUFFER_SIZE = 128; - RenderType.State renderState; + RenderType.CompositeState renderState; //LINES // RenderSystem.pushLightingAttributes(); @@ -68,25 +68,25 @@ public class BuildRenderTypes { // RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA); // // RenderSystem.lineWidth(2); - renderState = RenderType.State.builder() - .setLineState(new RenderState.LineState(OptionalDouble.of(2))) + renderState = RenderType.CompositeState.builder() + .setLineState(new RenderStateShard.LineStateShard(OptionalDouble.of(2))) .setLayeringState(PROJECTION_LAYERING) .setTransparencyState(TRANSLUCENT_TRANSPARENCY) .setWriteMaskState(WRITE_TO_DEPTH_AND_COLOR) .setCullState(CULL_DISABLED) .createCompositeState(false); LINES = RenderType.create("eb_lines", - DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, INITIAL_BUFFER_SIZE, renderState); + DefaultVertexFormat.POSITION_COLOR, GL11.GL_LINES, INITIAL_BUFFER_SIZE, renderState); - renderState = RenderType.State.builder() - .setLineState(new RenderState.LineState(OptionalDouble.of(2))) + renderState = RenderType.CompositeState.builder() + .setLineState(new RenderStateShard.LineStateShard(OptionalDouble.of(2))) .setLayeringState(PROJECTION_LAYERING) .setTransparencyState(TRANSLUCENT_TRANSPARENCY) .setWriteMaskState(COLOR_WRITE) .setCullState(CULL_DISABLED) .createCompositeState(false); PLANES = RenderType.create("eb_planes", - DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLE_STRIP, INITIAL_BUFFER_SIZE, renderState); + DefaultVertexFormat.POSITION_COLOR, GL11.GL_TRIANGLE_STRIP, INITIAL_BUFFER_SIZE, renderState); } @@ -107,32 +107,32 @@ public class BuildRenderTypes { //highjacking texturing state (which does nothing by default) to do my own things String stateName = "eb_texturing_" + dissolve + "_" + blockPos + "_" + firstPos + "_" + secondPos + "_" + red; - RenderState.TexturingState MY_TEXTURING = new RenderState.TexturingState(stateName, () -> { + RenderStateShard.TexturingStateShard MY_TEXTURING = new RenderStateShard.TexturingStateShard(stateName, () -> { // RenderSystem.pushLightingAttributes(); // RenderSystem.pushTextureAttributes(); - ShaderHandler.useShader(ShaderHandler.dissolve, generateShaderCallback(dissolve, Vector3d.atLowerCornerOf(blockPos), Vector3d.atLowerCornerOf(firstPos), Vector3d.atLowerCornerOf(secondPos), blockPos == secondPos, red)); + ShaderHandler.useShader(ShaderHandler.dissolve, generateShaderCallback(dissolve, Vec3.atLowerCornerOf(blockPos), Vec3.atLowerCornerOf(firstPos), Vec3.atLowerCornerOf(secondPos), blockPos == secondPos, red)); RenderSystem.blendColor(1f, 1f, 1f, 0.8f); }, ShaderHandler::releaseShader); - RenderType.State renderState = RenderType.State.builder() - .setTextureState(new RenderState.TextureState(ShaderHandler.shaderMaskTextureLocation, false, false)) + RenderType.CompositeState renderState = RenderType.CompositeState.builder() + .setTextureState(new RenderStateShard.TextureStateShard(ShaderHandler.shaderMaskTextureLocation, false, false)) .setTexturingState(MY_TEXTURING) .setTransparencyState(TRANSLUCENT_TRANSPARENCY) .setDiffuseLightingState(DIFFUSE_LIGHTING_DISABLED) .setAlphaState(DEFAULT_ALPHA) - .setCullState(new RenderState.CullState(true)) - .setLightmapState(new RenderState.LightmapState(false)) - .setOverlayState(new RenderState.OverlayState(false)) + .setCullState(new RenderStateShard.CullStateShard(true)) + .setLightmapState(new RenderStateShard.LightmapStateShard(false)) + .setOverlayState(new RenderStateShard.OverlayStateShard(false)) .createCompositeState(true); //Unique name for every combination, otherwise it will reuse the previous one String name = "eb_block_previews_" + dissolve + "_" + blockPos + "_" + firstPos + "_" + secondPos + "_" + red; return RenderType.create(name, - DefaultVertexFormats.BLOCK, GL11.GL_QUADS, 256, true, true, renderState); + DefaultVertexFormat.BLOCK, GL11.GL_QUADS, 256, true, true, renderState); } - private static Consumer generateShaderCallback(final float dissolve, final Vector3d blockpos, - final Vector3d firstpos, final Vector3d secondpos, + private static Consumer generateShaderCallback(final float dissolve, final Vec3 blockpos, + final Vec3 firstpos, final Vec3 secondpos, final boolean highlight, final boolean red) { Minecraft mc = Minecraft.getInstance(); return (Integer shader) -> { @@ -157,7 +157,7 @@ public class BuildRenderTypes { //image ARBShaderObjects.glUniform1iARB(imageUniform, primaryTextureUnit); glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + primaryTextureUnit); - mc.getTextureManager().bind(AtlasTexture.LOCATION_BLOCKS);//.getTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE).bindTexture(); + mc.getTextureManager().bind(TextureAtlas.LOCATION_BLOCKS);//.getTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE).bindTexture(); //GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.getTextureManager().getTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE).getGlTextureId()); //blockpos @@ -185,12 +185,12 @@ public class BuildRenderTypes { private class ShaderInfo { float dissolve; - Vector3d blockPos; - Vector3d firstPos; - Vector3d secondPos; + Vec3 blockPos; + Vec3 firstPos; + Vec3 secondPos; boolean red; - public ShaderInfo(float dissolve, Vector3d blockPos, Vector3d firstPos, Vector3d secondPos, boolean red) { + public ShaderInfo(float dissolve, Vec3 blockPos, Vec3 firstPos, Vec3 secondPos, boolean red) { this.dissolve = dissolve; this.blockPos = blockPos; this.firstPos = firstPos; diff --git a/src/main/java/nl/requios/effortlessbuilding/render/ModifierRenderer.java b/src/main/java/nl/requios/effortlessbuilding/render/ModifierRenderer.java index 877500a..1e2b144 100644 --- a/src/main/java/nl/requios/effortlessbuilding/render/ModifierRenderer.java +++ b/src/main/java/nl/requios/effortlessbuilding/render/ModifierRenderer.java @@ -1,10 +1,10 @@ package nl.requios.effortlessbuilding.render; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.client.renderer.IRenderTypeBuffer; -import net.minecraft.util.math.vector.Matrix4f; -import net.minecraft.util.math.vector.Vector3d; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.client.renderer.MultiBufferSource; +import com.mojang.math.Matrix4f; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; import nl.requios.effortlessbuilding.buildmodifier.Mirror; @@ -22,30 +22,30 @@ public class ModifierRenderer { protected static final Color colorRadial = new Color(52, 247, 255); protected static final int lineAlpha = 200; protected static final int planeAlpha = 75; - protected static final Vector3d epsilon = new Vector3d(0.001, 0.001, 0.001); //prevents z-fighting + protected static final Vec3 epsilon = new Vec3(0.001, 0.001, 0.001); //prevents z-fighting - public static void render(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, ModifierSettingsManager.ModifierSettings modifierSettings) { + public static void render(PoseStack matrixStack, MultiBufferSource.BufferSource renderTypeBuffer, ModifierSettingsManager.ModifierSettings modifierSettings) { //Mirror lines and areas Mirror.MirrorSettings m = modifierSettings.getMirrorSettings(); if (m != null && m.enabled && (m.mirrorX || m.mirrorY || m.mirrorZ)) { - Vector3d pos = m.position.add(epsilon); + Vec3 pos = m.position.add(epsilon); int radius = m.radius; if (m.mirrorX) { - Vector3d posA = new Vector3d(pos.x, pos.y - radius, pos.z - radius); - Vector3d posB = new Vector3d(pos.x, pos.y + radius, pos.z + radius); + Vec3 posA = new Vec3(pos.x, pos.y - radius, pos.z - radius); + Vec3 posB = new Vec3(pos.x, pos.y + radius, pos.z + radius); drawMirrorPlane(matrixStack, renderTypeBuffer, posA, posB, colorX, m.drawLines, m.drawPlanes, true); } if (m.mirrorY) { - Vector3d posA = new Vector3d(pos.x - radius, pos.y, pos.z - radius); - Vector3d posB = new Vector3d(pos.x + radius, pos.y, pos.z + radius); + Vec3 posA = new Vec3(pos.x - radius, pos.y, pos.z - radius); + Vec3 posB = new Vec3(pos.x + radius, pos.y, pos.z + radius); drawMirrorPlaneY(matrixStack, renderTypeBuffer, posA, posB, colorY, m.drawLines, m.drawPlanes); } if (m.mirrorZ) { - Vector3d posA = new Vector3d(pos.x - radius, pos.y - radius, pos.z); - Vector3d posB = new Vector3d(pos.x + radius, pos.y + radius, pos.z); + Vec3 posA = new Vec3(pos.x - radius, pos.y - radius, pos.z); + Vec3 posB = new Vec3(pos.x + radius, pos.y + radius, pos.z); drawMirrorPlane(matrixStack, renderTypeBuffer, posA, posB, colorZ, m.drawLines, m.drawPlanes, true); } @@ -60,19 +60,19 @@ public class ModifierRenderer { //Radial mirror lines and areas RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings(); if (r != null && r.enabled) { - Vector3d pos = r.position.add(epsilon); + Vec3 pos = r.position.add(epsilon); int radius = r.radius; float angle = 2f * ((float) Math.PI) / r.slices; - Vector3d relStartVec = new Vector3d(radius, 0, 0); + Vec3 relStartVec = new Vec3(radius, 0, 0); if (r.slices % 4 == 2) relStartVec = relStartVec.yRot(angle / 2f); for (int i = 0; i < r.slices; i++) { - Vector3d relNewVec = relStartVec.yRot(angle * i); - Vector3d newVec = pos.add(relNewVec); + Vec3 relNewVec = relStartVec.yRot(angle * i); + Vec3 newVec = pos.add(relNewVec); - Vector3d posA = new Vector3d(pos.x, pos.y - radius, pos.z); - Vector3d posB = new Vector3d(newVec.x, pos.y + radius, newVec.z); + Vec3 posA = new Vec3(pos.x, pos.y - radius, pos.z); + Vec3 posB = new Vec3(newVec.x, pos.y + radius, newVec.z); drawMirrorPlane(matrixStack, renderTypeBuffer, posA, posB, colorRadial, r.drawLines, r.drawPlanes, false); } } @@ -81,13 +81,13 @@ public class ModifierRenderer { //----Mirror---- - protected static void drawMirrorPlane(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, Vector3d posA, Vector3d posB, Color c, boolean drawLines, boolean drawPlanes, boolean drawVerticalLines) { + protected static void drawMirrorPlane(PoseStack matrixStack, MultiBufferSource.BufferSource renderTypeBuffer, Vec3 posA, Vec3 posB, Color c, boolean drawLines, boolean drawPlanes, boolean drawVerticalLines) { // GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha); Matrix4f matrixPos = matrixStack.last().pose(); if (drawPlanes) { - IVertexBuilder buffer = RenderHandler.beginPlanes(renderTypeBuffer); + VertexConsumer buffer = RenderHandler.beginPlanes(renderTypeBuffer); buffer.vertex(matrixPos, (float) posA.x, (float) posA.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex(); buffer.vertex(matrixPos, (float) posA.x, (float) posB.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex(); @@ -101,9 +101,9 @@ public class ModifierRenderer { } if (drawLines) { - IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer); + VertexConsumer buffer = RenderHandler.beginLines(renderTypeBuffer); - Vector3d middle = posA.add(posB).scale(0.5); + Vec3 middle = posA.add(posB).scale(0.5); buffer.vertex(matrixPos, (float) posA.x, (float) middle.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex(); buffer.vertex(matrixPos, (float) posB.x, (float) middle.y, (float) posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex(); if (drawVerticalLines) { @@ -115,13 +115,13 @@ public class ModifierRenderer { } } - protected static void drawMirrorPlaneY(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, Vector3d posA, Vector3d posB, Color c, boolean drawLines, boolean drawPlanes) { + protected static void drawMirrorPlaneY(PoseStack matrixStack, MultiBufferSource.BufferSource renderTypeBuffer, Vec3 posA, Vec3 posB, Color c, boolean drawLines, boolean drawPlanes) { // GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()); Matrix4f matrixPos = matrixStack.last().pose(); if (drawPlanes) { - IVertexBuilder buffer = RenderHandler.beginPlanes(renderTypeBuffer); + VertexConsumer buffer = RenderHandler.beginPlanes(renderTypeBuffer); buffer.vertex(matrixPos, (float) posA.x, (float) posA.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex(); buffer.vertex(matrixPos, (float) posA.x, (float) posA.y, (float) posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex(); @@ -135,9 +135,9 @@ public class ModifierRenderer { } if (drawLines) { - IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer); + VertexConsumer buffer = RenderHandler.beginLines(renderTypeBuffer); - Vector3d middle = posA.add(posB).scale(0.5); + Vec3 middle = posA.add(posB).scale(0.5); buffer.vertex(matrixPos, (float) middle.x, (float) middle.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex(); buffer.vertex(matrixPos, (float) middle.x, (float) middle.y, (float) posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex(); buffer.vertex(matrixPos, (float) posA.x, (float) middle.y, (float) middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex(); @@ -147,13 +147,13 @@ public class ModifierRenderer { } } - protected static void drawMirrorLines(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, Mirror.MirrorSettings m) { + protected static void drawMirrorLines(PoseStack matrixStack, MultiBufferSource.BufferSource renderTypeBuffer, Mirror.MirrorSettings m) { // GL11.glColor4d(100, 100, 100, 255); - IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer); + VertexConsumer buffer = RenderHandler.beginLines(renderTypeBuffer); Matrix4f matrixPos = matrixStack.last().pose(); - Vector3d pos = m.position.add(epsilon); + Vec3 pos = m.position.add(epsilon); buffer.vertex(matrixPos, (float) pos.x - m.radius, (float) pos.y, (float) pos.z).color(colorX.getRed(), colorX.getGreen(), colorX.getBlue(), lineAlpha).endVertex(); buffer.vertex(matrixPos, (float) pos.x + m.radius, (float) pos.y, (float) pos.z).color(colorX.getRed(), colorX.getGreen(), colorX.getBlue(), lineAlpha).endVertex(); diff --git a/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java b/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java index d398f87..2b7fda3 100644 --- a/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java +++ b/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java @@ -1,23 +1,23 @@ package nl.requios.effortlessbuilding.render; -import com.mojang.blaze3d.matrix.MatrixStack; -import com.mojang.blaze3d.vertex.IVertexBuilder; -import net.minecraft.block.BlockState; +import com.mojang.blaze3d.vertex.PoseStack; +import com.mojang.blaze3d.vertex.VertexConsumer; +import net.minecraft.world.level.block.state.BlockState; import net.minecraft.client.Minecraft; -import net.minecraft.client.audio.SimpleSound; -import net.minecraft.client.entity.player.ClientPlayerEntity; +import net.minecraft.client.resources.sounds.SimpleSoundInstance; +import net.minecraft.client.player.LocalPlayer; import net.minecraft.client.renderer.*; -import net.minecraft.client.renderer.model.IBakedModel; +import net.minecraft.client.resources.model.BakedModel; import net.minecraft.client.renderer.texture.OverlayTexture; -import net.minecraft.client.resources.I18n; -import net.minecraft.client.settings.KeyBinding; -import net.minecraft.entity.player.PlayerEntity; -import net.minecraft.util.SoundCategory; -import net.minecraft.util.SoundEvents; -import net.minecraft.util.math.AxisAlignedBB; -import net.minecraft.util.math.BlockPos; -import net.minecraft.util.math.shapes.VoxelShape; -import net.minecraft.util.math.vector.Vector3d; +import net.minecraft.client.resources.language.I18n; +import net.minecraft.client.KeyMapping; +import net.minecraft.world.entity.player.Player; +import net.minecraft.sounds.SoundSource; +import net.minecraft.sounds.SoundEvents; +import net.minecraft.world.phys.AABB; +import net.minecraft.core.BlockPos; +import net.minecraft.world.phys.shapes.VoxelShape; +import net.minecraft.world.phys.Vec3; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderWorldLastEvent; @@ -35,6 +35,10 @@ import nl.requios.effortlessbuilding.network.ModeSettingsMessage; import nl.requios.effortlessbuilding.network.PacketHandler; import nl.requios.effortlessbuilding.proxy.ClientProxy; +import com.mojang.blaze3d.vertex.BufferBuilder; +import com.mojang.blaze3d.vertex.Tesselator; +import net.minecraft.client.renderer.block.BlockRenderDispatcher; + /*** * Main render class for Effortless Building */ @@ -46,17 +50,17 @@ public class RenderHandler { if (event.getPhase() != EventPriority.NORMAL) return; - MatrixStack matrixStack = event.getMatrixStack(); - BufferBuilder bufferBuilder = Tessellator.getInstance().getBuilder(); - IRenderTypeBuffer.Impl renderTypeBuffer = IRenderTypeBuffer.immediate(bufferBuilder); + PoseStack matrixStack = event.getMatrixStack(); + BufferBuilder bufferBuilder = Tesselator.getInstance().getBuilder(); + MultiBufferSource.BufferSource renderTypeBuffer = MultiBufferSource.immediate(bufferBuilder); if (renderTypeBuffer == null) return; - PlayerEntity player = Minecraft.getInstance().player; + Player player = Minecraft.getInstance().player; ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player); ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player); - Vector3d projectedView = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition(); + Vec3 projectedView = Minecraft.getInstance().gameRenderer.getMainCamera().getPosition(); matrixStack.pushPose(); matrixStack.translate(-projectedView.x, -projectedView.y, -projectedView.z); @@ -74,7 +78,7 @@ public class RenderHandler { //Display Radial Menu public static void onRenderGameOverlay(final RenderGameOverlayEvent.Post event) { Minecraft mc = Minecraft.getInstance(); - ClientPlayerEntity player = mc.player; + LocalPlayer player = mc.player; //check if chisel and bits tool in hand (and has menu) // final boolean hasChiselInHand = CompatHelper.chiselsAndBitsProxy.isHoldingChiselTool(EnumHand.MAIN_HAND); @@ -129,7 +133,7 @@ public class RenderHandler { } if (mc.mouseHandler.isMouseGrabbed()) { - KeyBinding.releaseAll(); + KeyMapping.releaseAll(); } final int mouseX = ((int) mc.mouseHandler.xpos()) * scaledWidth / mc.getWindow().getWidth(); @@ -149,28 +153,28 @@ public class RenderHandler { public static void playRadialMenuSound() { final float volume = 0.1f; if (volume >= 0.0001f) { - SimpleSound sound = new SimpleSound(SoundEvents.UI_BUTTON_CLICK, SoundCategory.MASTER, volume, 1.0f, Minecraft.getInstance().player.blockPosition()); + SimpleSoundInstance sound = new SimpleSoundInstance(SoundEvents.UI_BUTTON_CLICK, SoundSource.MASTER, volume, 1.0f, Minecraft.getInstance().player.blockPosition()); Minecraft.getInstance().getSoundManager().play(sound); } } - protected static IVertexBuilder beginLines(IRenderTypeBuffer.Impl renderTypeBuffer) { + protected static VertexConsumer beginLines(MultiBufferSource.BufferSource renderTypeBuffer) { return renderTypeBuffer.getBuffer(BuildRenderTypes.LINES); } - protected static void endLines(IRenderTypeBuffer.Impl renderTypeBuffer) { + protected static void endLines(MultiBufferSource.BufferSource renderTypeBuffer) { renderTypeBuffer.endBatch(); } - protected static IVertexBuilder beginPlanes(IRenderTypeBuffer.Impl renderTypeBuffer) { + protected static VertexConsumer beginPlanes(MultiBufferSource.BufferSource renderTypeBuffer) { return renderTypeBuffer.getBuffer(BuildRenderTypes.PLANES); } - protected static void endPlanes(IRenderTypeBuffer.Impl renderTypeBuffer) { + protected static void endPlanes(MultiBufferSource.BufferSource renderTypeBuffer) { renderTypeBuffer.endBatch(); } - protected static void renderBlockPreview(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, BlockRendererDispatcher dispatcher, + protected static void renderBlockPreview(PoseStack matrixStack, MultiBufferSource.BufferSource renderTypeBuffer, BlockRenderDispatcher dispatcher, BlockPos blockPos, BlockState blockState, float dissolve, BlockPos firstPos, BlockPos secondPos, boolean red) { if (blockState == null) return; @@ -182,13 +186,13 @@ public class RenderHandler { //Begin block preview rendering RenderType blockPreviewRenderType = BuildRenderTypes.getBlockPreviewRenderType(dissolve, blockPos, firstPos, secondPos, red); - IVertexBuilder buffer = renderTypeBuffer.getBuffer(blockPreviewRenderType); + VertexConsumer buffer = renderTypeBuffer.getBuffer(blockPreviewRenderType); // MinecraftServer server = Minecraft.getInstance().getIntegratedServer(); // World world = DimensionManager.getWorld(server, DimensionType.OVERWORLD, false, true); try { - IBakedModel model = dispatcher.getBlockModel(blockState); + BakedModel model = dispatcher.getBlockModel(blockState); dispatcher.getModelRenderer().renderModel(matrixStack.last(), buffer, blockState, model, 1f, 1f, 1f, 0, OverlayTexture.NO_OVERLAY); // blockRendererDispatcher.getBlockModelRenderer().renderModel(world, blockRendererDispatcher.getModelForState(blockState), @@ -199,10 +203,10 @@ public class RenderHandler { //Render outline as backup, escape out of the current renderstack matrixStack.popPose(); renderTypeBuffer.endBatch(); - IVertexBuilder lineBuffer = beginLines(renderTypeBuffer); - renderBlockOutline(matrixStack, lineBuffer, blockPos, new Vector3d(1f, 1f, 1f)); + VertexConsumer lineBuffer = beginLines(renderTypeBuffer); + renderBlockOutline(matrixStack, lineBuffer, blockPos, new Vec3(1f, 1f, 1f)); endLines(renderTypeBuffer); - buffer = renderTypeBuffer.getBuffer(Atlases.translucentCullBlockSheet()); //any type will do, as long as we have something on the stack + buffer = renderTypeBuffer.getBuffer(Sheets.translucentCullBlockSheet()); //any type will do, as long as we have something on the stack matrixStack.pushPose(); } @@ -210,22 +214,22 @@ public class RenderHandler { matrixStack.popPose(); } - protected static void renderBlockOutline(MatrixStack matrixStack, IVertexBuilder buffer, BlockPos pos, Vector3d color) { + protected static void renderBlockOutline(PoseStack matrixStack, VertexConsumer buffer, BlockPos pos, Vec3 color) { renderBlockOutline(matrixStack, buffer, pos, pos, color); } //Renders outline. Pos1 has to be minimal x,y,z and pos2 maximal x,y,z - protected static void renderBlockOutline(MatrixStack matrixStack, IVertexBuilder buffer, BlockPos pos1, BlockPos pos2, Vector3d color) { - AxisAlignedBB aabb = new AxisAlignedBB(pos1, pos2.offset(1, 1, 1)).inflate(0.0020000000949949026); + protected static void renderBlockOutline(PoseStack matrixStack, VertexConsumer buffer, BlockPos pos1, BlockPos pos2, Vec3 color) { + AABB aabb = new AABB(pos1, pos2.offset(1, 1, 1)).inflate(0.0020000000949949026); - WorldRenderer.renderLineBox(matrixStack, buffer, aabb, (float) color.x, (float) color.y, (float) color.z, 0.4f); + LevelRenderer.renderLineBox(matrixStack, buffer, aabb, (float) color.x, (float) color.y, (float) color.z, 0.4f); // WorldRenderer.drawSelectionBoundingBox(aabb, (float) color.x, (float) color.y, (float) color.z, 0.4f); } //Renders outline with given bounding box - protected static void renderBlockOutline(MatrixStack matrixStack, IVertexBuilder buffer, BlockPos pos, VoxelShape collisionShape, Vector3d color) { + protected static void renderBlockOutline(PoseStack matrixStack, VertexConsumer buffer, BlockPos pos, VoxelShape collisionShape, Vec3 color) { // WorldRenderer.drawShape(collisionShape, pos.getX(), pos.getY(), pos.getZ(), (float) color.x, (float) color.y, (float) color.z, 0.4f); - WorldRenderer.renderVoxelShape(matrixStack, buffer, collisionShape, pos.getX(), pos.getY(), pos.getZ(), (float) color.x, (float) color.y, (float) color.z, 0.4f); + LevelRenderer.renderVoxelShape(matrixStack, buffer, collisionShape, pos.getX(), pos.getY(), pos.getZ(), (float) color.x, (float) color.y, (float) color.z, 0.4f); } //TODO 1.14 diff --git a/src/main/java/nl/requios/effortlessbuilding/render/ShaderHandler.java b/src/main/java/nl/requios/effortlessbuilding/render/ShaderHandler.java index b1c81d8..daeffd3 100644 --- a/src/main/java/nl/requios/effortlessbuilding/render/ShaderHandler.java +++ b/src/main/java/nl/requios/effortlessbuilding/render/ShaderHandler.java @@ -12,7 +12,7 @@ */ package nl.requios.effortlessbuilding.render; -import net.minecraft.util.ResourceLocation; +import net.minecraft.resources.ResourceLocation; import nl.requios.effortlessbuilding.BuildConfig; import nl.requios.effortlessbuilding.EffortlessBuilding; import nl.requios.effortlessbuilding.proxy.ClientProxy; diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index 5809f8c..6569222 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -1,3 +1,3 @@ -public net.minecraft.client.gui.widget.list.AbstractList field_230680_q_ # renderHeader -public net.minecraft.client.gui.FontRenderer func_228078_a_(Ljava/lang/String;FFILnet/minecraft/util/math/vector/Matrix4f;ZZ)I # renderString -public net.minecraft.inventory.container.ContainerType func_221505_a(Ljava/lang/String;Lnet/minecraft/inventory/container/ContainerType$IFactory;)Lnet/minecraft/inventory/container/ContainerType; # register \ No newline at end of file +public net.minecraft.client.gui.components.AbstractSelectionList f_93398_ # renderHeader +public net.minecraft.client.gui.Font m_92803_(Ljava/lang/String;FFILcom/mojang/math/Matrix4f;ZZ)I # renderString +public net.minecraft.world.inventory.MenuType m_39988_(Ljava/lang/String;Lnet/minecraft/world/inventory/MenuType$MenuSupplier;)Lnet/minecraft/world/inventory/MenuType; # register \ No newline at end of file