Update to 1.21.3

Author: Patbox

.github/workflows/build.yml

@@ -21,15 +21,15 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
 
       - name: Build with Gradle
         run: ./gradlew build
 
-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v4
         with:
           name: artifacts
           path: build/libs

.github/workflows/release.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
@@ -33,7 +33,7 @@ jobs:
         run: ./gradlew build
 
       - name: Upload GitHub release
-        uses: AButler/upload-release-assets@v2.0
+        uses: AButler/upload-release-assets@v3.0
         with:
           files: 'build/libs/*.jar;!build/libs/*-sources.jar;!build/libs/*-dev.jar'
           repo-token: ${{ secrets.GITHUB_TOKEN }}

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-  id 'fabric-loom' version '1.6.+'
+  id 'fabric-loom' version '1.7.+'
   id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -34,7 +34,7 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
   it.options.encoding = "UTF-8"
-  it.options.release = 17
+  it.options.release = 21
 }
 
 java {

gradle.properties

@@ -2,15 +2,15 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
-minecraft_version=1.20.4
-yarn_mappings=1.20.4+build.3
-loader_version=0.15.11
+minecraft_version=1.21.3
+yarn_mappings=1.21.3+build.1
+loader_version=0.16.9
 
 # Dependencies
-fabric_version=0.97.1+1.20.4
-plasmid_version=0.5.102-SNAPSHOT+1.20.4
+fabric_version=0.106.1+1.21.3
+plasmid_version=0.6.0+1.21.3
 
 # Mod Properties
-mod_version=1.2.1
+mod_version=1.2.2
 maven_group=io.github.restioson
 archives_base_name=loopdeloop

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

src/main/java/io/github/restioson/loopdeloop/LoopDeLoop.java

@@ -6,22 +6,22 @@
 import net.minecraft.util.Identifier;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import xyz.nucleoid.plasmid.game.GameType;
-import xyz.nucleoid.plasmid.game.stats.StatisticKey;
+import xyz.nucleoid.plasmid.api.game.GameType;
+import xyz.nucleoid.plasmid.api.game.stats.StatisticKey;
 
 public final class LoopDeLoop implements ModInitializer {
     public static final String ID = "loopdeloop";
     public static final Logger LOGGER = LogManager.getLogger(ID);
 
     public static final GameType<LoopDeLoopConfig> TYPE = GameType.register(
-            new Identifier(LoopDeLoop.ID, "loopdeloop"),
+            Identifier.of(LoopDeLoop.ID, "loopdeloop"),
             LoopDeLoopConfig.CODEC,
             LoopDeLoopWaiting::open
     );
 
-    public static final StatisticKey<Integer> TOTAL_HOOPS = StatisticKey.intKey(new Identifier(ID, "total_hoops"));
-    public static final StatisticKey<Integer> MISSED_HOOPS = StatisticKey.intKey(new Identifier(ID, "missed_hoops"));
-    public static final StatisticKey<Integer> BOOSTS_USED = StatisticKey.intKey(new Identifier(ID, "boosts_used"));
+    public static final StatisticKey<Integer> TOTAL_HOOPS = StatisticKey.intKey(Identifier.of(ID, "total_hoops"));
+    public static final StatisticKey<Integer> MISSED_HOOPS = StatisticKey.intKey(Identifier.of(ID, "missed_hoops"));
+    public static final StatisticKey<Integer> BOOSTS_USED = StatisticKey.intKey(Identifier.of(ID, "boosts_used"));
 
     @Override
     public void onInitialize() {

src/main/java/io/github/restioson/loopdeloop/game/LoopDeLoopActive.java

@@ -8,18 +8,18 @@
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import net.minecraft.block.Blocks;
+import net.minecraft.component.DataComponentTypes;
+import net.minecraft.component.type.FireworkExplosionComponent;
+import net.minecraft.component.type.FireworksComponent;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityType;
 import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.entity.player.ItemCooldownManager;
 import net.minecraft.entity.projectile.FireworkRocketEntity;
-import net.minecraft.item.FireworkRocketItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.nbt.NbtCompound;
-import net.minecraft.nbt.NbtElement;
-import net.minecraft.nbt.NbtInt;
 import net.minecraft.network.packet.s2c.play.EntityVelocityUpdateS2CPacket;
 import net.minecraft.scoreboard.AbstractTeam;
 import net.minecraft.server.network.ServerPlayerEntity;
@@ -32,28 +32,28 @@
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
-import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.random.Random;
 import net.minecraft.world.GameMode;
 import org.jetbrains.annotations.Nullable;
-import xyz.nucleoid.plasmid.game.GameCloseReason;
-import xyz.nucleoid.plasmid.game.GameSpace;
-import xyz.nucleoid.plasmid.game.common.GlobalWidgets;
-import xyz.nucleoid.plasmid.game.common.team.GameTeam;
-import xyz.nucleoid.plasmid.game.common.team.GameTeamConfig;
-import xyz.nucleoid.plasmid.game.common.team.GameTeamKey;
-import xyz.nucleoid.plasmid.game.common.team.TeamManager;
-import xyz.nucleoid.plasmid.game.event.GameActivityEvents;
-import xyz.nucleoid.plasmid.game.event.GamePlayerEvents;
-import xyz.nucleoid.plasmid.game.player.PlayerOffer;
-import xyz.nucleoid.plasmid.game.player.PlayerOfferResult;
-import xyz.nucleoid.plasmid.game.rule.GameRuleType;
-import xyz.nucleoid.plasmid.game.stats.StatisticKey;
-import xyz.nucleoid.plasmid.game.stats.StatisticKeys;
-import xyz.nucleoid.plasmid.util.ItemStackBuilder;
+import xyz.nucleoid.plasmid.api.game.GameCloseReason;
+import xyz.nucleoid.plasmid.api.game.GameSpace;
+import xyz.nucleoid.plasmid.api.game.common.GlobalWidgets;
+import xyz.nucleoid.plasmid.api.game.common.team.GameTeam;
+import xyz.nucleoid.plasmid.api.game.common.team.GameTeamConfig;
+import xyz.nucleoid.plasmid.api.game.common.team.GameTeamKey;
+import xyz.nucleoid.plasmid.api.game.common.team.TeamManager;
+import xyz.nucleoid.plasmid.api.game.event.GameActivityEvents;
+import xyz.nucleoid.plasmid.api.game.event.GamePlayerEvents;
+import xyz.nucleoid.plasmid.api.game.player.JoinAcceptor;
+import xyz.nucleoid.plasmid.api.game.player.JoinAcceptorResult;
+import xyz.nucleoid.plasmid.api.game.player.JoinOffer;
+import xyz.nucleoid.plasmid.api.game.rule.GameRuleType;
+import xyz.nucleoid.plasmid.api.game.stats.StatisticKeys;
+import xyz.nucleoid.plasmid.api.util.ItemStackBuilder;
+import xyz.nucleoid.stimuli.event.EventResult;
 import xyz.nucleoid.stimuli.event.item.ItemUseEvent;
 import xyz.nucleoid.stimuli.event.player.PlayerDamageEvent;
 import xyz.nucleoid.stimuli.event.player.PlayerDeathEvent;
@@ -142,7 +142,8 @@ public static void open(ServerWorld world, GameSpace gameSpace, LoopDeLoopMap ma
 
             activity.listen(GameActivityEvents.ENABLE, active::onOpen);
 
-            activity.listen(GamePlayerEvents.OFFER, active::offerPlayer);
+            activity.listen(GamePlayerEvents.OFFER, JoinOffer::acceptSpectators);
+            activity.listen(GamePlayerEvents.ACCEPT, active::acceptPlayer);
             activity.listen(GamePlayerEvents.REMOVE, active::removePlayer);
 
             activity.listen(GameActivityEvents.TICK, active::tick);
@@ -154,34 +155,35 @@ public static void open(ServerWorld world, GameSpace gameSpace, LoopDeLoopMap ma
         });
     }
 
-    private TypedActionResult<ItemStack> onUseItem(ServerPlayerEntity player, Hand hand) {
+    private ActionResult onUseItem(ServerPlayerEntity player, Hand hand) {
         ItemStack heldStack = player.getStackInHand(hand);
 
         LoopDeLoopPlayer state = this.playerStates.get(player);
         if (state != null) {
             if (heldStack.getItem() == Items.FEATHER) {
                 ItemCooldownManager cooldown = player.getItemCooldownManager();
-                if (!cooldown.isCoolingDown(heldStack.getItem())) {
+                if (!cooldown.isCoolingDown(heldStack)) {
                     Vec3d rotationVec = player.getRotationVec(1.0F);
                     player.setVelocity(rotationVec.multiply(LEAP_VELOCITY));
                     Vec3d oldVel = player.getVelocity();
                     player.setVelocity(oldVel.x, oldVel.y + 0.5f, oldVel.z);
                     player.networkHandler.sendPacket(new EntityVelocityUpdateS2CPacket(player));
 
-                    player.playSound(SoundEvents.ENTITY_HORSE_SADDLE, SoundCategory.PLAYERS, 1.0F, 1.0F);
-                    cooldown.set(heldStack.getItem(), LEAP_INTERVAL_TICKS);
+                    player.playSoundToPlayer(SoundEvents.ENTITY_HORSE_SADDLE, SoundCategory.PLAYERS, 1.0F, 1.0F);
+                    cooldown.set(heldStack, LEAP_INTERVAL_TICKS);
 
                     state.boostUsed++;
+                    return ActionResult.SUCCESS_SERVER;
                 }
             } else if (heldStack.getItem() == Items.FIREWORK_ROCKET) {
                 ItemCooldownManager cooldown = player.getItemCooldownManager();
-                if (!cooldown.isCoolingDown(heldStack.getItem())) {
+                if (!cooldown.isCoolingDown(heldStack)) {
                     state.boostUsed++;
                 }
             }
         }
 
-        return TypedActionResult.pass(ItemStack.EMPTY);
+        return ActionResult.PASS;
     }
 
     private void onOpen() {
@@ -218,7 +220,7 @@ private void onOpen() {
         this.sidebar.render(this.buildLeaderboard());
     }
 
-    private PlayerOfferResult offerPlayer(PlayerOffer offer) {
+    private JoinAcceptorResult acceptPlayer(JoinAcceptor offer) {
         return this.spawnLogic.acceptPlayer(offer, GameMode.SPECTATOR);
     }
 
@@ -292,7 +294,7 @@ private void tickPlayers(long time) {
 
     private boolean tickPlayer(ServerPlayerEntity player, LoopDeLoopPlayer state, long time) {
         if (time < this.fallFlyingTime) {
-            player.startFallFlying();
+            player.startGliding();
         }
 
         int nextHoopIdx = state.lastHoop + 1;
@@ -314,7 +316,7 @@ private boolean tickPlayer(ServerPlayerEntity player, LoopDeLoopPlayer state, lo
         state.lastPos = currentPos;
 
         if (nextHoop.intersectsSegment(lastPos, currentPos)) {
-            player.playSound(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.PLAYERS, 1.0F, 1.0F);
+            player.playSoundToPlayer(SoundEvents.ENTITY_EXPERIENCE_ORB_PICKUP, SoundCategory.PLAYERS, 1.0F, 1.0F);
 
             if (!this.config.flappyMode()) {
                 giveRocket(player, 1, this.config.rocketPower());
@@ -387,7 +389,7 @@ private void onPlayerFinish(ServerPlayerEntity player, LoopDeLoopPlayer state, l
                 .append(" place!");
 
         player.sendMessage(message, true);
-        player.playSound(SoundEvents.ENTITY_PLAYER_LEVELUP, SoundCategory.PLAYERS, 1.0F, 1.0F);
+        player.playSoundToPlayer(SoundEvents.ENTITY_PLAYER_LEVELUP, SoundCategory.PLAYERS, 1.0F, 1.0F);
         player.changeGameMode(GameMode.SPECTATOR);
         if (this.finished.size() == 1 && (long) playerStates.entrySet().size() > 1) isFirst = true;
         this.publishPlayerStatistics(player, state, time, isFirst);
@@ -442,7 +444,7 @@ private void failHoop(ServerPlayerEntity player, LoopDeLoopPlayer state, long ti
             );
         }
 
-        player.playSound(SoundEvents.ENTITY_VILLAGER_NO, SoundCategory.PLAYERS, 1.0F, 1.0F);
+        player.playSoundToPlayer(SoundEvents.ENTITY_VILLAGER_NO, SoundCategory.PLAYERS, 1.0F, 1.0F);
     }
 
     private void broadcastWin() {
@@ -471,16 +473,16 @@ private void broadcastWin() {
         this.broadcastSound(SoundEvents.ENTITY_VILLAGER_YES);
     }
 
-    private ActionResult onPlayerDamage(ServerPlayerEntity player, DamageSource source, float amount) {
+    private EventResult onPlayerDamage(ServerPlayerEntity player, DamageSource source, float amount) {
         long time = this.world.getTime();
         this.failHoop(player, this.playerStates.get(player), time);
-        return ActionResult.FAIL;
+        return EventResult.DENY;
     }
 
-    private ActionResult onPlayerDeath(ServerPlayerEntity player, DamageSource source) {
+    private EventResult onPlayerDeath(ServerPlayerEntity player, DamageSource source) {
         long time = this.world.getTime();
         this.failHoop(player, this.playerStates.get(player), time);
-        return ActionResult.FAIL;
+        return EventResult.DENY;
     }
 
     private void spawnParticipant(ServerPlayerEntity player) {
@@ -504,9 +506,7 @@ private void spawnParticipant(ServerPlayerEntity player) {
 
     private static void giveRocket(ServerPlayerEntity player, int n, int flightPower) {
         ItemStack rockets = new ItemStack(Items.FIREWORK_ROCKET, n);
-        NbtCompound rocketPowered = new NbtCompound();
-        rocketPowered.putInt("Flight", flightPower);
-        rockets.getOrCreateNbt().put("Fireworks", rocketPowered);
+        rockets.set(DataComponentTypes.FIREWORKS, new FireworksComponent(flightPower, List.of()));
         player.getInventory().insertStack(rockets);
     }
 
@@ -515,7 +515,7 @@ private void broadcastSound(SoundEvent sound, float pitch) {
             if (player.equals(this.lastCompleter)) {
                 continue;
             }
-            player.playSound(sound, SoundCategory.PLAYERS, 1.0F, pitch);
+            player.playSoundToPlayer(sound, SoundCategory.PLAYERS, 1.0F, pitch);
         }
     }
 

src/main/java/io/github/restioson/loopdeloop/game/LoopDeLoopConfig.java

@@ -1,17 +1,18 @@
 package io.github.restioson.loopdeloop.game;
 
 import com.mojang.serialization.Codec;
+import com.mojang.serialization.MapCodec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import io.github.restioson.loopdeloop.LoopDeLoop;
 import net.minecraft.block.Block;
 import net.minecraft.block.Blocks;
 import net.minecraft.registry.RegistryCodecs;
 import net.minecraft.registry.RegistryKeys;
 import net.minecraft.registry.entry.RegistryEntryList;
-import xyz.nucleoid.plasmid.game.common.config.PlayerConfig;
+import xyz.nucleoid.plasmid.api.game.common.config.WaitingLobbyConfig;
 
 public record LoopDeLoopConfig(
-        PlayerConfig players,
+        WaitingLobbyConfig players,
         int timeLimit,
         int loops,
         int loopRadius,
@@ -26,8 +27,8 @@ public record LoopDeLoopConfig(
         boolean infiniteMode,
         boolean debugMode
 ) {
-    public static final Codec<LoopDeLoopConfig> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-            PlayerConfig.CODEC.fieldOf("players").orElse(new PlayerConfig(1, 100)).forGetter(LoopDeLoopConfig::players),
+    public static final MapCodec<LoopDeLoopConfig> CODEC = RecordCodecBuilder.mapCodec(instance -> instance.group(
+            WaitingLobbyConfig.CODEC.fieldOf("players").orElse(new WaitingLobbyConfig(1, 100)).forGetter(LoopDeLoopConfig::players),
             Codec.INT.fieldOf("time_limit_secs").forGetter(LoopDeLoopConfig::timeLimit),
             Codec.INT.fieldOf("loops").forGetter(LoopDeLoopConfig::loops),
             Codec.INT.fieldOf("loop_radius").orElse(5).forGetter(LoopDeLoopConfig::loopRadius),

src/main/java/io/github/restioson/loopdeloop/game/LoopDeLoopPlayer.java

@@ -4,7 +4,9 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.math.Vec3d;
-import xyz.nucleoid.plasmid.game.stats.StatisticMap;
+import xyz.nucleoid.plasmid.api.game.stats.StatisticMap;
+
+import java.util.Set;
 
 public class LoopDeLoopPlayer {
     public final ServerPlayerEntity player;
@@ -26,7 +28,7 @@ public LoopDeLoopPlayer(ServerPlayerEntity player) {
 
     public void teleport(double x, double y, double z) {
         ServerWorld world = this.player.getServerWorld();
-        this.player.teleport(world, x, y, z, 0.0F, 0.0F);
+        this.player.teleport(world, x, y, z, Set.of(), 0.0F, 0.0F, false);
         this.lastPos = new Vec3d(x, y, z);
     }
 

src/main/java/io/github/restioson/loopdeloop/game/LoopDeLoopSideBar.java

@@ -3,8 +3,8 @@
 import net.minecraft.scoreboard.number.FixedNumberFormat;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
-import xyz.nucleoid.plasmid.game.common.GlobalWidgets;
-import xyz.nucleoid.plasmid.game.common.widget.SidebarWidget;
+import xyz.nucleoid.plasmid.api.game.common.GlobalWidgets;
+import xyz.nucleoid.plasmid.api.game.common.widget.SidebarWidget;
 
 import java.util.List;