Spawnpoint system

Author: Nekiplay

src/main/java/nekiplay/protrainer/features/commands/TrainerCommand.java

@@ -8,7 +8,10 @@
 import meteordevelopment.meteorclient.commands.Command;
 import meteordevelopment.meteorclient.events.entity.player.PlayerMoveEvent;
 import meteordevelopment.meteorclient.events.packets.PacketEvent;
+import meteordevelopment.meteorclient.events.render.Render2DEvent;
 import meteordevelopment.meteorclient.events.world.BlockUpdateEvent;
+import meteordevelopment.meteorclient.renderer.text.TextRenderer;
+import meteordevelopment.meteorclient.utils.render.NametagUtils;
 import meteordevelopment.orbit.EventHandler;
 import nekiplay.Main;
 import nekiplay.protrainer.ProTrainerAddon;
@@ -26,6 +29,7 @@
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.Vec3i;
 import net.minecraft.world.World;
+import org.joml.Vector3d;
 
 import java.io.*;
 import java.nio.charset.StandardCharsets;
@@ -47,6 +51,8 @@ public TrainerCommand() {
 	public Gson gson = new Gson();
 	public boolean started = false;
 	public Vec3d start_position = new Vec3d(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
+	public Vec3d spawnpoint_position = new Vec3d(Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY, Double.NEGATIVE_INFINITY);
+
 
 	public List<BlockDataAndPosition> replaced = new ArrayList<>();
 	public HashMap<BlockPosition, BlockData> map_blocks = new HashMap<>();
@@ -71,6 +77,15 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
 			}
 			return SINGLE_SUCCESS;
 		}));
+		builder.then(literal("spawnpoint").executes(context -> {
+			if (started) {
+				mc.player.setPos(spawnpoint_position.x, spawnpoint_position.y, spawnpoint_position.z);
+			}
+			else {
+				warning("Parkour hasn't started");
+			}
+			return SINGLE_SUCCESS;
+		}));
 		builder.then(literal("start").then(argument("map", StringArgumentType.string()).executes(context -> {
 			if (started) {
 				error("Parkour has already begun");
@@ -86,6 +101,7 @@ public void build(LiteralArgumentBuilder<CommandSource> builder) {
 				File dir2 = new File(dir, map + ".json");
 
 				start_position = mc.player.getPos();
+				spawnpoint_position = mc.player.getPos().add(0, 1, 0);
 
 				new Thread(() -> {
 					try {
@@ -248,27 +264,25 @@ public List<BlockPos> collectBlocksBetween(World world, BlockPos start, BlockPos
 	@EventHandler
 	private void onPlayerMove(PlayerMoveEvent event) {
 		BlockPos pos = mc.player.getBlockPos();
-		BlockPos pos_down = pos.down();
 
 		BlockState state = mc.world.getBlockState(pos);
-		BlockState state_down = mc.world.getBlockState(pos_down);
 
 		if (started) {
 			var module = ProTrainerAddon.getInstance().module;
 
 			if (module.respawnBlocks.get().contains(state.getBlock())) {
-				mc.player.setPos(start_position.x, start_position.y, start_position.z);
+				mc.player.setPos(spawnpoint_position.x, spawnpoint_position.y, spawnpoint_position.z);
 			}
-			if (module.respawnBlocks.get().contains(state_down.getBlock())) {
-				mc.player.setPos(start_position.x, start_position.y, start_position.z);
+			if (module.checkPointsBlocks.get().contains(state.getBlock())) {
+				spawnpoint_position = new Vec3d(pos.getX() + 0.5, pos.getY() + 1, pos.getZ() + 0.5);
 			}
 		}
  	}
 
 	@EventHandler
 	private void onBlockUpdate(BlockUpdateEvent event) {
 		BlockPosition position = new BlockPosition(event.pos);
-		BlockDataAndPosition position2 = new BlockDataAndPosition(Blocks.AIR.getDefaultState(), event.pos);
+		BlockDataAndPosition position2 = new BlockDataAndPosition(event.oldState, event.pos);
 		if (map_blocks.containsKey(position) && started) {
 			BlockData data = map_blocks.get(position);
 			mc.world.setBlockState(event.pos, Block.getStateFromRawId(data.blockId));
@@ -279,6 +293,36 @@ private void onBlockUpdate(BlockUpdateEvent event) {
 		}
 	}
 
+	@EventHandler
+	private void on2DRender(Render2DEvent event) {
+		if (started) {
+			Vec3d camera_pos = mc.gameRenderer.getCamera().getPos();
+			Vector3d pos2 = new Vector3d(spawnpoint_position.x, spawnpoint_position.y, spawnpoint_position.z);
+			if (pos2.distance(camera_pos.x, camera_pos.y, camera_pos.z) <= ProTrainerAddon.getInstance().module.spawnpointTextRenderDistance.get()) {
+				if (NametagUtils.to2D(pos2, 1, true)) {
+					TextRenderer text = TextRenderer.get();
+					NametagUtils.begin(pos2);
+					text.beginBig();
+
+					String hologram_text = "Spawnpoint";
+					double hologramWidth = text.getWidth(hologram_text, true);
+					double heightDown = text.getHeight(true);
+
+					double widthHalf = hologramWidth / 2;
+
+
+					double hX = -widthHalf;
+					double hY = -heightDown;
+
+					text.render(hologram_text, hX, hY, ProTrainerAddon.getInstance().module.spawnpointTextColor.get(), true);
+
+					text.end();
+					NametagUtils.end();
+				}
+			}
+		}
+	}
+
 	@EventHandler
 	private void onSendPacket(PacketEvent.Send event) {
 		if (event.packet instanceof PlayerMoveC2SPacket playerMoveC2SPacket) {

src/main/java/nekiplay/protrainer/features/modules/ProTrainerModule.java

@@ -1,11 +1,9 @@
 package nekiplay.protrainer.features.modules;
 
-import meteordevelopment.meteorclient.settings.BlockListSetting;
-import meteordevelopment.meteorclient.settings.IntSetting;
-import meteordevelopment.meteorclient.settings.Setting;
-import meteordevelopment.meteorclient.settings.SettingGroup;
+import meteordevelopment.meteorclient.settings.*;
 import meteordevelopment.meteorclient.systems.modules.Categories;
 import meteordevelopment.meteorclient.systems.modules.Module;
+import meteordevelopment.meteorclient.utils.render.color.SettingColor;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 
@@ -17,6 +15,7 @@ public ProTrainerModule() {
 	}
 
 	private final SettingGroup defaultGroup = settings.getDefaultGroup();
+	private final SettingGroup spawnpointsGroup = settings.createGroup("Spawnpoints");
 	private final SettingGroup respawnGroup = settings.createGroup("Respawning");
 
 	public final Setting<Integer> loadingSpeed = defaultGroup.add(new IntSetting.Builder()
@@ -31,8 +30,27 @@ public ProTrainerModule() {
 	);
 	public final Setting<List<Block>> respawnBlocks = respawnGroup.add(new BlockListSetting.Builder()
 		.name("respawn-blocks")
-		.description("The blocks you don't want to mine.")
 		.defaultValue(List.of(Blocks.LAVA))
 		.build()
 	);
+	public final Setting<List<Block>> checkPointsBlocks = respawnGroup.add(new BlockListSetting.Builder()
+		.name("checkpoint-blocks")
+		.defaultValue(List.of(Blocks.LIGHT_WEIGHTED_PRESSURE_PLATE))
+		.build()
+	);
+
+	public final Setting<SettingColor> spawnpointTextColor = spawnpointsGroup.add(new ColorSetting.Builder()
+		.name("spawnpoint-text-color")
+		.defaultValue(new SettingColor(255, 0, 0, 255))
+		.build()
+	);
+
+	public final Setting<Double> spawnpointTextRenderDistance = spawnpointsGroup.add(new DoubleSetting.Builder()
+		.name("spawnpoint-text-render-distance")
+		.defaultValue(32)
+		.max(64)
+		.sliderRange(0, 64)
+		.description("The blocks you don't want to mine.")
+		.build()
+	);
 }