port to 1.21.3, rework customSticky mixin

Author: TexBlock

CHANGELOG.md

@@ -1,2 +1,3 @@
 ## Changelog
-- fix `releaseTarget`
+- port to 1.21.3
+- rework `customSticky` mixin

docs/scarpet/Full.md

@@ -2954,7 +2954,7 @@ It returns a `map` with a report indicating how many chunks were affected, and h
 
 Adds a chunk ticket at a position, which makes the game to keep the designated area centered around
 `pos` with radius of `radius` loaded for a predefined amount of ticks, defined by `type`. Allowed types
-are `portal`: 300 ticks, `teleport`: 40 ticks, and `unknown`: 1 tick. Radius can be from 1 to 32 ticks.
+are `portal`: 300 ticks, `teleport`: 5 ticks, and `unknown`: 1 tick. Radius can be from 1 to 32 ticks.
 
 This function is tentative - will likely change when chunk ticket API is properly fleshed out.
 

docs/scarpet/api/BlocksAndWorldAccess.md

@@ -625,7 +625,7 @@ It returns a `map` with a report indicating how many chunks were affected, and h
 
 Adds a chunk ticket at a position, which makes the game to keep the designated area centered around
 `pos` with radius of `radius` loaded for a predefined amount of ticks, defined by `type`. Allowed types
-are `portal`: 300 ticks, `teleport`: 40 ticks, and `unknown`: 1 tick. Radius can be from 1 to 32 ticks.
+are `portal`: 300 ticks, `teleport`: 5 ticks, and `unknown`: 1 tick. Radius can be from 1 to 32 ticks.
 
 This function is tentative - will likely change when chunk ticket API is properly fleshed out.
 

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 loom.platform = neoforge
 
 # Mod Properties
-	minecraft_version=1.21.4
-	neoforge_version=21.4.112-beta
+	minecraft_version=1.21.3
+	neoforge_version=21.3.65
 	jsr305_version=3.0.2
-	parchment_mappings=2025.01.19
+	parchment_mappings=2024.12.07
 
 # Mod Properties
-	upstream_version = 1.4.147
-	mod_version = 0.1.4
+	upstream_version = 1.4.158
+	mod_version = 0.1.5
 	maven_group = org.thinkingstudio.bedsheet
 	archives_base_name = bedsheet
 

src/main/java/carpet/CarpetServer.java

@@ -31,7 +31,6 @@
 import carpet.utils.SpawnReporter;
 import com.mojang.brigadier.CommandDispatcher;
 
-//import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.Commands;
@@ -51,8 +50,7 @@ public class CarpetServer // static for now - easier to handle all around the co
 
     /**
      * Registers a {@link CarpetExtension} to be managed by Carpet.<br>
-     * Should be called before Carpet's startup.
-     *
+     * Should be called before Carpet's startup
      * @param extension The instance of a {@link CarpetExtension} to be registered
      */
     public static void manageExtension(CarpetExtension extension)
@@ -68,8 +66,9 @@ public static void manageExtension(CarpetExtension extension)
         }
     }
 
-    // Separate from onServerLoaded, as it is possible to load the server multiple times in a single player game.
-    // Called by NeoForge from the mod constructor to allow extensions to register in the mod constructor before this call.
+    // Separate from onServerLoaded, because a server can be loaded multiple times in singleplayer
+    // Gets called by Fabric Loader from a ServerModInitializer and a ClientModInitializer, in both to allow extensions 
+    // to register before this call in a ModInitializer (declared in fabric.mod.json)
     public static void onGameStarted()
     {
         settingsManager = new carpet.settings.SettingsManager(CarpetSettings.carpetVersion, "carpet", "Carpet Mod");

src/main/java/carpet/CarpetSettings.java

@@ -28,8 +28,8 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.thinkingstudio.bedsheet.util.NeoHooks;
 import org.thinkingstudio.bedsheet.BedSheetModReference;
+import org.thinkingstudio.bedsheet.util.NeoHooks;
 
 import java.util.Optional;
 
@@ -73,7 +73,7 @@ private static class LanguageValidator extends Validator<String> {
     @Rule(
             desc = "Sets the language for Carpet",
             category = FEATURE,
-            options = {"en_us", "fr_fr", "es_ar","pt_br", "zh_cn", "zh_tw"},
+            options = {"en_us", "fr_fr", "pt_br", "zh_cn", "zh_tw"},
             strict = true, // the current system doesn't handle fallbacks and other, not defined languages would make unreadable mess. Change later
             validate = LanguageValidator.class
     )

src/main/java/carpet/api/settings/SettingsManager.java

@@ -45,8 +45,6 @@
 import carpet.utils.Messenger;
 import carpet.utils.TranslationKeys;
 import carpet.utils.Translations;
-//import net.fabricmc.api.EnvType;
-//import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.SharedSuggestionProvider;

src/main/java/carpet/commands/PlayerCommand.java

@@ -190,11 +190,6 @@ private static boolean cantSpawn(CommandContext<CommandSourceStack> context)
         MinecraftServer server = context.getSource().getServer();
         PlayerList manager = server.getPlayerList();
 
-        if (EntityPlayerMPFake.isSpawningPlayer(playerName))
-        {
-            Messenger.m(context.getSource(), "r Player ", "rb " + playerName, "r  is currently logging on");
-            return true;
-        }
         if (manager.getPlayerByName(playerName) != null)
         {
             Messenger.m(context.getSource(), "r Player ", "rb " + playerName, "r  is already logged on");

src/main/java/carpet/helpers/HopperCounter.java

@@ -37,7 +37,6 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static java.util.Map.entry;
@@ -421,10 +420,13 @@ public static TextColor guessColor(Item item, Level level)
         {
             for (Ingredient ingredient : r.placementInfo().ingredients())
             {
-                Optional<Holder<Item>> match = ingredient.items().filter(stack -> fromItem(stack.value(), registryAccess) != null).findFirst();
-                if (match.isPresent())
+                for (Holder<Item> stack : ingredient.items())
                 {
-                    return fromItem(match.get().value(), registryAccess);
+                    TextColor cand = fromItem(stack.value(), registryAccess);
+                    if (cand != null)
+                    {
+                        return cand;
+                    }
                 }
             }
         }

src/main/java/carpet/helpers/ParticleDisplay.java

@@ -18,7 +18,7 @@ public static void drawParticleLine(ServerPlayer player, Vec3 from, Vec3 to, Str
         if (accentParticle != null) player.serverLevel().sendParticles(
                 player,
                 accentParticle,
-                true, true,
+                true,
                 to.x, to.y, to.z, count,
                 spread, spread, spread, 0.0);
 
@@ -33,7 +33,7 @@ public static void drawParticleLine(ServerPlayer player, Vec3 from, Vec3 to, Str
             player.serverLevel().sendParticles(
                     player,
                     mainParticle,
-                    true, true,
+                    true,
                     delta.x+from.x, delta.y+from.y, delta.z+from.z, 1,
                     0.0, 0.0, 0.0, 0.0);
         }