Merge pull request #1 from anhgelus/refactor/1.21

[Refactor] Change mod version to 1.21

6 files changed, 418 insertions, 196 deletions

diff --git a/src/main/java/world/anhgelus/manhunt/Manhunt.java b/src/main/java/world/anhgelus/manhunt/Manhunt.java
index 36e1be0..fe761de 100644
--- a/src/main/java/world/anhgelus/manhunt/Manhunt.java
+++ b/src/main/java/world/anhgelus/manhunt/Manhunt.java
@@ -1,141 +1,145 @@
-package world.anhgelus.manhunt;
-
-import com.mojang.brigadier.Command;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.builder.RequiredArgumentBuilder;
-import com.mojang.serialization.DataResult;
-import net.fabricmc.api.ModInitializer;
-import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
-import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;
-import net.minecraft.command.EntitySelector;
-import net.minecraft.command.arguments.EntityArgumentType;
-import net.minecraft.datafixer.NbtOps;
-import net.minecraft.entity.effect.StatusEffectInstance;
-import net.minecraft.entity.effect.StatusEffects;
-import net.minecraft.item.ItemStack;
-import net.minecraft.item.Items;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtHelper;
-import net.minecraft.nbt.Tag;
-import net.minecraft.server.PlayerManager;
-import net.minecraft.server.command.ServerCommandSource;
-import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.world.GameMode;
-import net.minecraft.world.World;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-
-import java.util.*;
-
-import static com.mojang.brigadier.builder.LiteralArgumentBuilder.literal;
-
-public class Manhunt implements ModInitializer {
-	// This logger is used to write text to the console and the log file.
-	// It is considered best practice to use your mod id as the logger's name.
-	// That way, it's clear which mod wrote info, warnings, and errors.
-    public static final Logger LOGGER = LogManager.getLogger("manhunt");
-    public static final String MOD_ID = "manhunt";
-
-	private final Set<UUID> hunters = new HashSet<>();
-	private final Set<UUID> speedrunners = new HashSet<>();
-	private final Map<UUID, UUID> map = new HashMap<>();
-
-	private final Timer timer = new Timer();
-
-	@Override
-	public void onInitialize() {
-		LOGGER.info("Initializing Manhunt");
-
-		final LiteralArgumentBuilder<ServerCommandSource> command = literal("manhunt");
-
-		final LiteralArgumentBuilder<ServerCommandSource> track = literal("track");
-		track.then(RequiredArgumentBuilder.<ServerCommandSource, EntitySelector>argument("player", EntityArgumentType.player())
-				.executes(context -> {
-					final ServerCommandSource source = context.getSource();
-					final ServerPlayerEntity tracked = (ServerPlayerEntity) EntityArgumentType.getEntity(context, "player");
-					final ServerPlayerEntity player = source.getPlayer();
-					map.put(source.getPlayer().getUuid(), player.getUuid());
-					updateCompass(player, tracked);
-					return Command.SINGLE_SUCCESS;
-				})
-		);
-		final LiteralArgumentBuilder<ServerCommandSource> team = literal("team");
-		final RequiredArgumentBuilder<ServerCommandSource, EntitySelector> teamP = RequiredArgumentBuilder.argument("player", EntityArgumentType.player());
-		teamP.then(LiteralArgumentBuilder.<ServerCommandSource>literal("hunter").executes(context -> {
-					final ServerPlayerEntity p = (ServerPlayerEntity) EntityArgumentType.getEntity(context, "player");
-                    speedrunners.remove(p.getUuid());
-					hunters.add(p.getUuid());
-					return Command.SINGLE_SUCCESS;
-				}))
-				.then(LiteralArgumentBuilder.<ServerCommandSource>literal("speedrunner").executes(context -> {
-					final ServerPlayerEntity p = (ServerPlayerEntity) EntityArgumentType.getEntity(context, "player");
-					hunters.remove(p.getUuid());
-					speedrunners.add(p.getUuid());
-					return Command.SINGLE_SUCCESS;
-				}));
-		team.then(teamP);
-		final LiteralArgumentBuilder<ServerCommandSource> start = literal("start");
-		start.executes(context -> {
-			final PlayerManager pm = context.getSource().getMinecraftServer().getPlayerManager();
-			for (final ServerPlayerEntity player : pm.getPlayerList()) {
-				speedrunners.remove(player.getUuid());
-				player.kill();
-				speedrunners.add(player.getUuid());
-			}
-			for (final UUID uuid : hunters) {
-				final ServerPlayerEntity hunter = pm.getPlayer(uuid);
-				assert hunter != null;
-				hunter.giveItemStack(new ItemStack(Items.COMPASS));
-				hunter.addStatusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 30, 255));
-				hunter.addStatusEffect(new StatusEffectInstance(StatusEffects.MINING_FATIGUE, 30, 255));
-			}
-			timer.schedule(new TimerTask() {
-				@Override
-				public void run() {
-					for (final UUID uuid : hunters) {
-						final ServerPlayerEntity hunter = pm.getPlayer(uuid);
-						if (hunter == null) continue;
-						final ServerPlayerEntity tracked = pm.getPlayer(uuid);
-						if (tracked == null) continue;
-						updateCompass(hunter, tracked);
-					}
-				}
-			}, 60*1000, 60*1000);
-			return Command.SINGLE_SUCCESS;
-		});
-
-		command.then(track);
-		command.then(team);
-		command.then(start);
-
-		CommandRegistrationCallback.EVENT.register((dispatcher, dedicated) -> dispatcher.register(command));
-
-		ServerPlayerEvents.AFTER_RESPAWN.register((oldPlayer, newPlayer, alive) -> {
-			if (alive) return;
-			final UUID uuid = oldPlayer.getUuid();
-			if (hunters.contains(uuid)) {
-				newPlayer.giveItemStack(new ItemStack(Items.COMPASS));
-				return;
-			}
-			speedrunners.remove(uuid);
-			if (!speedrunners.isEmpty()) return;
-			for (final ServerPlayerEntity player : newPlayer.server.getPlayerManager().getPlayerList()) {
-				player.setGameMode(GameMode.SPECTATOR);
-				hunters.remove(player.getUuid());
-				speedrunners.remove(player.getUuid());
-			}
-		});
-	}
-
-	private void updateCompass(ServerPlayerEntity player, ServerPlayerEntity tracked) {
-		final ItemStack stack = new ItemStack(Items.COMPASS);
-		assert stack.getTag() != null;
-		final CompoundTag tag = stack.getTag();
-		tag.put("LodestonePos", NbtHelper.fromBlockPos(tracked.getBlockPos()));
-		final DataResult<Tag> weird = World.CODEC.encodeStart(NbtOps.INSTANCE, player.world.getRegistryKey());
-		weird.resultOrPartial(LOGGER::error).ifPresent((t) -> tag.put("LodestoneDimension", t));
-		tag.putBoolean("LodestoneTracked", true);
-		final int slot = player.inventory.getSlotWithStack(new ItemStack(Items.COMPASS));
-		player.inventory.insertStack(slot, stack);
-	}
+package world.anhgelus.manhunt;

+

+import com.mojang.brigadier.Command;

+import com.mojang.brigadier.builder.LiteralArgumentBuilder;

+import com.mojang.brigadier.builder.RequiredArgumentBuilder;

+import net.fabricmc.api.ModInitializer;

+import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;

+import net.fabricmc.fabric.api.entity.event.v1.ServerPlayerEvents;

+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerEntityEvents;

+import net.minecraft.command.EntitySelector;

+import net.minecraft.command.argument.EntityArgumentType;

+import net.minecraft.component.DataComponentTypes;

+import net.minecraft.component.type.LodestoneTrackerComponent;

+import net.minecraft.entity.effect.StatusEffectInstance;

+import net.minecraft.entity.effect.StatusEffects;

+import net.minecraft.entity.mob.PiglinBruteEntity;

+import net.minecraft.item.ItemStack;

+import net.minecraft.item.Items;

+import net.minecraft.server.PlayerManager;

+import net.minecraft.server.command.ServerCommandSource;

+import net.minecraft.server.network.ServerPlayerEntity;

+import net.minecraft.util.math.GlobalPos;

+import net.minecraft.world.GameMode;

+import org.apache.logging.log4j.LogManager;

+import org.apache.logging.log4j.Logger;

+

+import java.util.*;

+

+import static com.mojang.brigadier.builder.LiteralArgumentBuilder.literal;

+

+public class Manhunt implements ModInitializer {

+	public static final String MOD_ID = "manhunt";

+	public static final Logger LOGGER = LogManager.getLogger(MOD_ID);

+

+	private final Set<UUID> hunters = new HashSet<>();

+	private final Set<UUID> speedrunners = new HashSet<>();

+	private final Map<UUID, UUID> map = new HashMap<>();

+	private final Map<UUID, ItemStack> compassMap = new HashMap<>();

+

+	private final Timer timer = new Timer();

+

+	@Override

+	public void onInitialize() {

+		LOGGER.info("Initializing Manhunt");

+

+		final LiteralArgumentBuilder<ServerCommandSource> command = literal("manhunt");

+

+		final LiteralArgumentBuilder<ServerCommandSource> track = literal("track");

+		track.then(RequiredArgumentBuilder.<ServerCommandSource, EntitySelector>argument("player", EntityArgumentType.player())

+				.executes(context -> {

+					final ServerCommandSource source = context.getSource();

+					final ServerPlayerEntity tracked = (ServerPlayerEntity) EntityArgumentType.getEntity(context, "player");

+					final ServerPlayerEntity player = source.getPlayer();

+					if (player == null) return 2;

+					map.put(source.getPlayer().getUuid(), tracked.getUuid());

+					updateCompass(player, tracked);

+					return Command.SINGLE_SUCCESS;

+				})

+		);

+		final LiteralArgumentBuilder<ServerCommandSource> team = literal("team");

+		final RequiredArgumentBuilder<ServerCommandSource, EntitySelector> teamP = RequiredArgumentBuilder.argument("player", EntityArgumentType.player());

+		teamP.then(LiteralArgumentBuilder.<ServerCommandSource>literal("hunter").executes(context -> {

+					final ServerPlayerEntity p = (ServerPlayerEntity) EntityArgumentType.getEntity(context, "player");

+                    speedrunners.remove(p.getUuid());

+					hunters.add(p.getUuid());

+					return Command.SINGLE_SUCCESS;

+				}))

+				.then(LiteralArgumentBuilder.<ServerCommandSource>literal("speedrunner").executes(context -> {

+					final ServerPlayerEntity p = (ServerPlayerEntity) EntityArgumentType.getEntity(context, "player");

+					hunters.remove(p.getUuid());

+					speedrunners.add(p.getUuid());

+					return Command.SINGLE_SUCCESS;

+				}));

+		team.then(teamP);

+		final LiteralArgumentBuilder<ServerCommandSource> start = literal("start");

+		start.executes(context -> {

+			final PlayerManager pm = context.getSource().getServer().getPlayerManager();

+			for (final ServerPlayerEntity player : pm.getPlayerList()) {

+				speedrunners.remove(player.getUuid());

+				player.kill();

+				speedrunners.add(player.getUuid());

+			}

+			for (final UUID uuid : hunters) {

+				final ServerPlayerEntity hunter = pm.getPlayer(uuid);

+				assert hunter != null;

+				final ItemStack isACompass = new ItemStack(Items.COMPASS);

+				compassMap.put(hunter.getUuid(), isACompass);

+				hunter.giveItemStack(isACompass);

+				hunter.addStatusEffect(new StatusEffectInstance(StatusEffects.SLOWNESS, 30, 255));

+				hunter.addStatusEffect(new StatusEffectInstance(StatusEffects.MINING_FATIGUE, 30, 255));

+			}

+			timer.schedule(new TimerTask() {

+				@Override

+				public void run() {

+					for (final UUID uuid : hunters) {

+						final ServerPlayerEntity hunter = pm.getPlayer(uuid);

+						if (hunter == null) continue;

+						final ServerPlayerEntity tracked = pm.getPlayer(uuid);

+						if (tracked == null) continue;

+						updateCompass(hunter, tracked);

+					}

+				}

+			}, 60*1000, 60*1000);

+			return Command.SINGLE_SUCCESS;

+		});

+

+		command.then(track);

+		command.then(team);

+		command.then(start);

+

+		CommandRegistrationCallback.EVENT.register((dispatcher, registryAccess, environment) -> dispatcher.register(command));

+

+		ServerPlayerEvents.AFTER_RESPAWN.register((oldPlayer, newPlayer, alive) -> {

+			if (alive) return;

+			final UUID uuid = oldPlayer.getUuid();

+			if (hunters.contains(uuid)) {

+				newPlayer.giveItemStack(new ItemStack(Items.COMPASS));

+				return;

+			}

+			speedrunners.remove(uuid);

+			if (!speedrunners.isEmpty()) return;

+			for (final ServerPlayerEntity player : newPlayer.server.getPlayerManager().getPlayerList()) {

+				player.changeGameMode(GameMode.SPECTATOR);

+				hunters.remove(player.getUuid());

+				speedrunners.remove(player.getUuid());

+			}

+		});

+

+		ServerEntityEvents.ENTITY_LOAD.register((entity, world) -> {

+			if (entity instanceof PiglinBruteEntity) entity.discard();

+		});

+	}

+

+	private void updateCompass(ServerPlayerEntity player, ServerPlayerEntity tracked) {

+		final LodestoneTrackerComponent trackerCpnt = new LodestoneTrackerComponent(Optional.of(GlobalPos.create(tracked.getWorld().getRegistryKey(), tracked.getBlockPos())), true);

+		final ItemStack is = compassMap.get(player.getUuid());

+		if (is == null) {

+			LOGGER.warn("Compass item is null");

+			return;

+		}

+		final int slot = player.getInventory().getSlotWithStack(is);

+		is.set(DataComponentTypes.LODESTONE_TRACKER, trackerCpnt);

+		player.getInventory().setStack(slot, is);

+	}

 }
\ No newline at end of file
diff --git a/src/main/java/world/anhgelus/manhunt/mixin/ExampleMixin.java b/src/main/java/world/anhgelus/manhunt/mixin/ExampleMixin.java
deleted file mode 100644
index f3263af..0000000
--- a/src/main/java/world/anhgelus/manhunt/mixin/ExampleMixin.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package world.anhgelus.manhunt.mixin;
-
-import net.minecraft.server.MinecraftServer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(MinecraftServer.class)
-public class ExampleMixin {
-	@Inject(at = @At("HEAD"), method = "loadWorld")
-	private void init(CallbackInfo info) {
-		// This code is injected into the start of MinecraftServer.loadWorld()V
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/loot_table/gameplay/piglin_bartering.json b/src/main/resources/data/minecraft/loot_table/gameplay/piglin_bartering.json
new file mode 100644
index 0000000..09f15e8
--- /dev/null
+++ b/src/main/resources/data/minecraft/loot_table/gameplay/piglin_bartering.json
@@ -0,0 +1,239 @@
+{

+  "type": "minecraft:barter",

+  "pools": [

+    {

+      "rolls": 1,

+      "entries": [

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:book",

+          "weight": 5,

+          "functions": [

+            {

+              "function": "minecraft:enchant_randomly",

+              "options": "minecraft:soul_speed"

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:iron_boots",

+          "weight": 8,

+          "functions": [

+            {

+              "function": "minecraft:enchant_randomly",

+              "options": "minecraft:soul_speed"

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:potion",

+          "weight": 10,

+          "functions": [

+            {

+              "function": "minecraft:set_potion",

+              "id": "minecraft:fire_resistance"

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:splash_potion",

+          "weight": 10,

+          "functions": [

+            {

+              "function": "minecraft:set_potion",

+              "id": "minecraft:fire_resistance"

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:iron_nugget",

+          "weight": 10,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 9,

+                "max": 36

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:quartz",

+          "weight": 20,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 8,

+                "max": 16

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:glowstone_dust",

+          "weight": 20,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 5,

+                "max": 12

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:magma_cream",

+          "weight": 20,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 2,

+                "max": 6

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:ender_pearl",

+          "weight": 20,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 4,

+                "max": 8

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:string",

+          "weight": 20,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 8,

+                "max": 24

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:fire_charge",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 1,

+                "max": 5

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:gravel",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 8,

+                "max": 16

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:leather",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 4,

+                "max": 10

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:nether_brick",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 4,

+                "max": 16

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:obsidian",

+          "weight": 40

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:crying_obsidian",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 1,

+                "max": 3

+              }

+            }

+          ]

+        },

+        {

+          "type": "minecraft:item",

+          "name": "minecraft:soul_sand",

+          "weight": 40,

+          "functions": [

+            {

+              "function": "minecraft:set_count",

+              "count": {

+                "type": "minecraft:uniform",

+                "min": 4,

+                "max": 16

+              }

+            }

+          ]

+        }

+      ]

+    }

+  ]

+}

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 5ade821..b097ea1 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -1,33 +1,30 @@
-{
-	"schemaVersion": 1,
-	"id": "manhunt",
-	"version": "${version}",
-	"name": "Manhunt",
-	"description": "Best Manhunt Minecraft mod.",
-	"authors": [
-		"Anhgelus Morhtuuzh"
-	],
-	"contact": {
-		"sources": "https://github.com/anhgelus/manhunt-mod"
-	},
-	"license": "AGPL-3.0",
-	"icon": "assets/manhunt/icon.png",
-	"environment": "server",
-	"entrypoints": {
-		"main": [
-			"world.anhgelus.manhunt.Manhunt"
-		]
-	},
-	"mixins": [
-		"manhunt.mixins.json"
-	],
-	"depends": {
-		"fabricloader": ">=0.15.11",
-		"minecraft": "~1.16.1",
-		"java": ">=17",
-		"fabric": "*"
-	},
-	"suggests": {
-		"difficultydeathscaler": "*"
-	}
+{

+	"schemaVersion": 1,

+	"id": "manhunt",

+	"version": "${version}",

+	"name": "Manhunt",

+	"description": "Best Manhunt Minecraft mod.",

+	"authors": [

+		"Anhgelus Morhtuuzh"

+	],

+	"contact": {

+		"sources": "https://github.com/anhgelus/manhunt-mod"

+	},

+	"license": "AGPL-3.0",

+	"icon": "assets/manhunt/icon.png",

+	"environment": "server",

+	"entrypoints": {

+		"main": [

+			"world.anhgelus.manhunt.Manhunt"

+		]

+	},

+	"depends": {

+		"fabricloader": ">=0.15.11",

+		"minecraft": "~1.21",

+		"java": ">=21",

+		"fabric": "*"

+	},

+	"suggests": {

+		"difficultydeathscaler": "*"

+	}

 }
\ No newline at end of file
diff --git a/src/main/resources/manhunt.mixins.json b/src/main/resources/manhunt.mixins.json
deleted file mode 100644
index 4fcff5b..0000000
--- a/src/main/resources/manhunt.mixins.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-	"required": true,
-	"package": "world.anhgelus.manhunt.mixin",
-	"compatibilityLevel": "JAVA_17",
-	"mixins": [],
-	"injectors": {
-		"defaultRequire": 1
-	}
-}
\ No newline at end of file
diff --git a/src/main/resources/pack.mcmeta b/src/main/resources/pack.mcmeta
new file mode 100644
index 0000000..ffe0b8e
--- /dev/null
+++ b/src/main/resources/pack.mcmeta
@@ -0,0 +1,6 @@
+{

+  "pack": {

+    "pack_format": 48,

+    "description": "isACompass"

+  }

+}
\ No newline at end of file