Merge remote-tracking branch 'upstream/master' into mbnbt

Author: ch-yx

.github/workflows/build-on-pr.yml

@@ -12,11 +12,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
         cache: 'gradle'
     - name: Grant execute permission to gradlew
       run: chmod +x gradlew

.github/workflows/devbuild.yml

@@ -12,11 +12,11 @@ jobs:
 
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 17
+    - name: Set up JDK 21
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
-        java-version: 17
+        java-version: 21
         cache: 'gradle'
     - name: Grant execute permission to gradlew
       run: chmod +x gradlew

.github/workflows/publish-release.yml

@@ -81,11 +81,11 @@ jobs:
         uses: actions/checkout@v3
         with:
           ref: ${{ steps.getbranchinfo.outputs.branchname }}
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
       - name: Grant execute permission to gradlew
         run: chmod +x gradlew
@@ -167,11 +167,11 @@ jobs:
     steps:
       - name: Checkout Carpet sources
         uses: actions/checkout@v3
-      - name: Set up JDK 17
+      - name: Set up JDK 21
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
           cache: 'gradle'
       - name: Checkout wiki
         uses: actions/checkout@v3

README.md

@@ -30,10 +30,6 @@ For core carpet functionality, this is the right place. Check available download
 
 Check [carpet-extra](https://github.com/gnembon/carpet-extra/) add-on mod for more whacky and crazy features, including autocrafting, block-placing dispensers, and even chicken-shearing!
 
-## auto crafting table
-
-Due to compatibility issues with vanilla and other mods, download [auto crafting table](https://github.com/gnembon/carpet-autoCraftingTable/releases) by Skyrising as a separate add-on to carpet
-
 ## scarpet app store
 
 If you want to browse or contribute to the scarpet app store check available apps, go [here](https://github.com/gnembon/scarpet), its free!

build.gradle

@@ -1,11 +1,11 @@
 plugins {
-	id 'fabric-loom' version '1.0-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'io.github.juuxel.loom-quiltflower' version '1.7.3'
 	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.minecraft_version+'-'+project.mod_version+'+v'+new Date().format('yyMMdd')
@@ -47,8 +47,8 @@ tasks.withType(JavaCompile).configureEach {
 	// If Javadoc is generated, this must be specified in that task too.
 	it.options.encoding = "UTF-8"
 
-	// Minecraft 1.18 upwards uses Java 17.
-	it.options.release = 17
+	// Minecraft 1.20.5 upwards uses Java 21.
+	it.options.release = 21
 }
 
 java {

docs/scarpet/Full.md

@@ -3650,7 +3650,7 @@ version indicates the version of the connected carpet client.
 ### `query(e, 'effect', name?)`
 
 Without extra arguments, it returns list of effect active on a living entity. Each entry is a triple of short 
-effect name, amplifier, and remaining duration in ticks. With an argument, if the living entity has not that potion active, 
+effect name, amplifier, and remaining duration in ticks (-1 if it has infinity duration). With an argument, if the living entity has not that potion active, 
 returns `null`, otherwise return a tuple of amplifier and remaining duration.
 
 <pre>
@@ -3990,7 +3990,7 @@ players, since they are controlled client side.
 ### `modify(e, 'effect', name?, duration?, amplifier?, show_particles?, show_icon?, ambient?)`
 
 Applies status effect to the living entity. Takes several optional parameters, which default to `0`, `true`, 
-`true` and `false`. If no duration is specified, or if it's null or 0, the effect is removed. If name is not specified,
+`true` and `false`. If no duration is specified, or if it's null or 0, the effect is removed. If duration is less than 0, it will represent infinity. If name is not specified,
 it clears all effects.
 
 ### `modify(e, 'health', float)`
@@ -4257,7 +4257,8 @@ use the same scheme.
  If the entity or a block doesn't have 
 an inventory, all API functions typically do nothing and return null.
 
-Most items returned are in the form of a triple of item name, count, and nbt or the extra data associated with an item. 
+Most items returned are in the form of a triple of item name, count, and the full nbt of an item. When saving an item, if the
+nbt is provided, it overrides the item type provided in the name.
 
 ### `item_list(tag?)`
 
@@ -4370,20 +4371,22 @@ negative numbers to indicate slots counted from 'the back'.
 
 <pre>
 inventory_get(player(), 0) => null // nothing in first hotbar slot
-inventory_get(x,y,z, 5) => ['stone', 1, {}]
-inventory_get(player(), -1) => ['diamond_pickaxe', 1, {Damage:4}] // slightly damaged diamond pick in the offhand
+inventory_get(x,y,z, 5) => ['stone', 1, {id:"minecraft:stone"}]
+inventory_get(player(), -1) => ['diamond_pickaxe', 1, {components:{"minecraft:damage":4},id:"minecraft:diamond_pickaxe"}] // slightly damaged diamond pick in the offhand
 </pre>
 
 ### `inventory_set(inventory, slot, count, item?, nbt?)`
 
 Modifies or sets a stack in inventory. specify count 0 to empty the slot. If item is not specified, keeps existing 
-item, just modifies the count. If item is provided - replaces current item. If nbt is provided - adds a tag to the 
-stack at slot. Returns previous stack in that slot.
+item, just modifies the count. If item is provided - replaces current item. If nbt is provided - uses the tag to create the item fully
+ignoring the item name. If nbt is provided and count is not null, the sets the custom count on the tag from the count parameter.
+If count is `null` and item is `null`, an item is entirely defined by the `nbt` parameter. Returns previous stack in that slot.
 
 <pre>
-inventory_set(player(), 0, 0) => ['stone', 64, {}] // player had a stack of stone in first hotbar slot
-inventory_set(player(), 0, 6) => ['diamond', 64, {}] // changed stack of diamonds in player slot to 6
-inventory_set(player(), 0, 1, 'diamond_axe','{Damage:5}') => null //added slightly damaged diamond axe to first player slot
+inventory_set(player(), 0, 0) => ['stone', 64, {id:"minecraft:stone"}] // player had a stack of stone in first hotbar slot
+inventory_set(player(), 0, 6) => ['diamond', 64, {id:"minecraft:diamond"}] // changed stack of diamonds in player slot to 6
+inventory_set(player(), 0, 1, 'diamond_axe','{components:{"minecraft:damage":5},id:"minecraft:diamond_axe"}') => null //added slightly damaged diamond axe to first player slot
+inventory_set(player(), 0, null, null, '{components:{"minecraft:damage":5},id:"minecraft:diamond_axe"}') => null // same effect as above
 </pre>
 
 ### `inventory_find(inventory, item, start_slot?, ), inventory_find(inventory, null, start_slot?)`
@@ -5334,9 +5337,8 @@ Valid mixer options are `master`, `music`, `record`, `weather`, `block`, `hostil
 and `voice`. `pos` can be either a block, triple of coords, or a list of three numbers. Uses the same options as a
  corresponding `playsound` command.
  
-Used with no arguments, return the list of available sound names.
- 
-Throws `unknown_sound` if sound doesn't exist.
+Used with no arguments, returns a list of available sound names. Note that this list may not include all sounds that
+clients will actually be able to receive (they may have more available via resourcepacks for example).
 
 ## Particles
 

docs/scarpet/api/Auxiliary.md

@@ -12,9 +12,8 @@ Valid mixer options are `master`, `music`, `record`, `weather`, `block`, `hostil
 and `voice`. `pos` can be either a block, triple of coords, or a list of three numbers. Uses the same options as a
  corresponding `playsound` command.
 
-Used with no arguments, return the list of available sound names.
- 
-Throws `unknown_sound` if sound doesn't exist.
+Used with no arguments, returns a list of available sound names. Note that this list may not include all sounds that
+clients will actually be able to receive (they may have more available via resourcepacks for example).
 
 ## Particles
 

docs/scarpet/api/Entities.md

@@ -421,7 +421,7 @@ version indicates the version of the connected carpet client.
 ### `query(e, 'effect', name?)`
 
 Without extra arguments, it returns list of effect active on a living entity. Each entry is a triple of short 
-effect name, amplifier, and remaining duration in ticks. With an argument, if the living entity has not that potion active, 
+effect name, amplifier, and remaining duration in ticks (-1 if it has infinity duration). With an argument, if the living entity has not that potion active, 
 returns `null`, otherwise return a tuple of amplifier and remaining duration.
 
 <pre>
@@ -761,7 +761,7 @@ players, since they are controlled client side.
 ### `modify(e, 'effect', name?, duration?, amplifier?, show_particles?, show_icon?, ambient?)`
 
 Applies status effect to the living entity. Takes several optional parameters, which default to `0`, `true`, 
-`true` and `false`. If no duration is specified, or if it's null or 0, the effect is removed. If name is not specified,
+`true` and `false`. If no duration is specified, or if it's null or 0, the effect is removed. If duration is less than 0, it will represent infinity. If name is not specified,
 it clears all effects.
 
 ### `modify(e, 'health', float)`

docs/scarpet/api/Inventories.md

@@ -26,7 +26,8 @@ use the same scheme.
  If the entity or a block doesn't have 
 an inventory, all API functions typically do nothing and return null.
 
-Most items returned are in the form of a triple of item name, count, and nbt or the extra data associated with an item. 
+Most items returned are in the form of a triple of item name, count, and the full nbt of an item. When saving an item, if the
+nbt is provided, it overrides the item type provided in the name.
 
 ### `item_list(tag?)`
 
@@ -139,20 +140,22 @@ negative numbers to indicate slots counted from 'the back'.
 
 <pre>
 inventory_get(player(), 0) => null // nothing in first hotbar slot
-inventory_get(x,y,z, 5) => ['stone', 1, {}]
-inventory_get(player(), -1) => ['diamond_pickaxe', 1, {Damage:4}] // slightly damaged diamond pick in the offhand
+inventory_get(x,y,z, 5) => ['stone', 1, {id:"minecraft:stone"}]
+inventory_get(player(), -1) => ['diamond_pickaxe', 1, {components:{"minecraft:damage":4},id:"minecraft:diamond_pickaxe"}] // slightly damaged diamond pick in the offhand
 </pre>
 
 ### `inventory_set(inventory, slot, count, item?, nbt?)`
 
 Modifies or sets a stack in inventory. specify count 0 to empty the slot. If item is not specified, keeps existing 
-item, just modifies the count. If item is provided - replaces current item. If nbt is provided - adds a tag to the 
-stack at slot. Returns previous stack in that slot.
+item, just modifies the count. If item is provided - replaces current item. If nbt is provided - uses the tag to create the item fully
+ignoring the item name. If nbt is provided and count is not null, the sets the custom count on the tag from the count parameter.
+If count is `null` and item is `null`, an item is entirely defined by the `nbt` parameter. Returns previous stack in that slot.
 
 <pre>
-inventory_set(player(), 0, 0) => ['stone', 64, {}] // player had a stack of stone in first hotbar slot
-inventory_set(player(), 0, 6) => ['diamond', 64, {}] // changed stack of diamonds in player slot to 6
-inventory_set(player(), 0, 1, 'diamond_axe','{Damage:5}') => null //added slightly damaged diamond axe to first player slot
+inventory_set(player(), 0, 0) => ['stone', 64, {id:"minecraft:stone"}] // player had a stack of stone in first hotbar slot
+inventory_set(player(), 0, 6) => ['diamond', 64, {id:"minecraft:diamond"}] // changed stack of diamonds in player slot to 6
+inventory_set(player(), 0, 1, 'diamond_axe','{components:{"minecraft:damage":5},id:"minecraft:diamond_axe"}') => null //added slightly damaged diamond axe to first player slot
+inventory_set(player(), 0, null, null, '{components:{"minecraft:damage":5},id:"minecraft:diamond_axe"}') => null // same effect as above
 </pre>
 
 ### `inventory_find(inventory, item, start_slot?, ), inventory_find(inventory, null, start_slot?)`

gradle.properties

@@ -3,26 +3,26 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check https://fabricmc.net/develop/
-	minecraft_version=23w43a
-	loader_version=0.14.22
+	minecraft_version=1.21
+	loader_version=0.15.11
 	jsr305_version=3.0.2
-	fabric_version=0.89.3+1.20.2
+	fabric_version=0.99.2+1.21
 
 # Mod Properties
-	mod_version = 1.4.123
+	mod_version = 1.4.147
 	maven_group = carpet
 	archives_base_name = fabric-carpet
 
 # Release Action properties for Curseforge and Snapshots
 	# The Curseforge versions "names" or ids for the main branch (comma separated: 1.16.4,1.16.5)
 	# This is needed because CF uses too vague names for prereleases and release candidates
 	# Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN]
-	release-curse-versions = Minecraft 1.20:1.20.3-Snapshot
+	release-curse-versions = Minecraft 1.21:1.21
 	# Whether or not to build another branch on release
 	release-extra-branch = false
 	# The name of the second branch to release
-	release-extra-branch-name = 1.20.2
+	release-extra-branch-name = 1.20.4
 	# The "name" or id of the Curseforge version for the secondary branch
 	# This is needed because CF uses too vague names for snapshots
 	# Can also be the version ID directly coming from https://minecraft.curseforge.com/api/game/versions?token=[API_TOKEN]
-	release-extra-curse-version = Minecraft 1.20:1.20.2
+	release-extra-curse-version = Minecraft 1.20:1.20.4-Snapshot

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

jitpack.yml

@@ -1,3 +1,3 @@
 before_install:
-- sdk install java 17.0.1-open
-- sdk use java 17.0.1-open
+- sdk install java 21.0.2-open
+- sdk use java 21.0.2-open

src/main/java/carpet/CarpetSettings.java

@@ -9,8 +9,8 @@
 import carpet.utils.Translations;
 import carpet.utils.CommandHelper;
 import carpet.utils.Messenger;
-import carpet.utils.SpawnChunks;
 import net.fabricmc.loader.api.FabricLoader;
+import net.fabricmc.loader.api.SemanticVersion;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
@@ -49,7 +49,10 @@
 public class CarpetSettings
 {
     public static final String carpetVersion = FabricLoader.getInstance().getModContainer("carpet").orElseThrow().getMetadata().getVersion().toString();
-    public static final String releaseTarget = "1.20.3";
+    public static final int [] releaseTarget =  {
+            ((SemanticVersion)FabricLoader.getInstance().getModContainer("minecraft").orElseThrow().getMetadata().getVersion()).getVersionComponent(1),
+            ((SemanticVersion)FabricLoader.getInstance().getModContainer("minecraft").orElseThrow().getMetadata().getVersion()).getVersionComponent(2)
+    };
     public static final Logger LOG = LoggerFactory.getLogger("carpet");
     public static final ThreadLocal<Boolean> skipGenerationChecks = ThreadLocal.withInitial(() -> false);
     public static final ThreadLocal<Boolean> impendingFillSkipUpdates = ThreadLocal.withInitial(() -> false);
@@ -319,7 +322,7 @@ public Integer validate(CommandSourceStack source, CarpetRule<Integer> changingR
             int minRange = 0;
             int maxRange = 1;
 
-            if (source == null) {
+            if (source == null || !source.getServer().isReady()) {
                 maxRange = Integer.MAX_VALUE;
             } else {
                 for (Level level : source.getServer().getAllLevels()) {
@@ -770,37 +773,6 @@ private static class SimulationDistanceValidator extends Validator<Integer>
     )
     public static int simulationDistance = 0;
 
-    public static class ChangeSpawnChunksValidator extends Validator<Integer> {
-        @Override public Integer validate(CommandSourceStack source, CarpetRule<Integer> currentRule, Integer newValue, String string) {
-            if (source == null) return newValue;
-            if (newValue < 0 || newValue > 32)
-            {
-                Messenger.m(source, "r spawn chunk size has to be between 0 and 32");
-                return null;
-            }
-            if (currentRule.value().intValue() == newValue.intValue())
-            {
-                //must been some startup thing
-                return newValue;
-            }
-            ServerLevel currentOverworld = source.getServer().overworld();
-            if (currentOverworld != null)
-            {
-                SpawnChunks.changeSpawnSize(currentOverworld, newValue);
-            }
-            return newValue;
-        }
-    }
-    @Rule(
-            desc = "Changes size of spawn chunks",
-            extra = {"Defines new radius", "setting it to 0 - disables spawn chunks"},
-            category = CREATIVE,
-            strict = false,
-            options = {"0", "11"},
-            validate = ChangeSpawnChunksValidator.class
-    )
-    public static int spawnChunksSize = MinecraftServer.START_CHUNK_RADIUS;
-
     public enum RenewableCoralMode {
         FALSE,
         EXPANDED,

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

@@ -16,6 +16,7 @@
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import net.minecraft.SharedConstants;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.DimensionArgument;
@@ -293,16 +294,18 @@ private static int spawn(CommandContext<CommandSourceStack> context) throws Comm
             Messenger.m(source, "rb Player " + playerName + " cannot be placed outside of the world");
             return 0;
         }
-        EntityPlayerMPFake.createFake(playerName, source.getServer(), pos, facing.y, facing.x, dimType, mode, flying, () -> {
+        boolean success = EntityPlayerMPFake.createFake(playerName, source.getServer(), pos, facing.y, facing.x, dimType, mode, flying);
+        if (!success) {
             Messenger.m(source, "rb Player " + playerName + " doesn't exist and cannot spawn in online mode. " +
-                    "Turn the server offline to spawn non-existing players");
-        });
+                    "Turn the server offline or the allowSpawningOfflinePlayers on to spawn non-existing players");
+            return 0;
+        };
         return 1;
     }
 
     private static int maxNameLength(MinecraftServer server)
     {
-        return server.getPort() >= 0 ? Player.MAX_NAME_LENGTH : 40;
+        return server.getPort() >= 0 ? SharedConstants.MAX_PLAYER_NAME_LENGTH : 40;
     }
 
     private static int manipulate(CommandContext<CommandSourceStack> context, Consumer<EntityPlayerActionPack> action)

src/main/java/carpet/fakes/ChunkHolderInterface.java

@@ -1,14 +1,13 @@
 package carpet.fakes;
 
-import com.mojang.datafixers.util.Either;
 import java.util.concurrent.CompletableFuture;
-import net.minecraft.server.level.ChunkHolder;
+import net.minecraft.server.level.ChunkResult;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.thread.BlockableEventLoop;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.ChunkAccess;
 
 public interface ChunkHolderInterface
 {
-    CompletableFuture<Either<ChunkAccess, ChunkHolder.ChunkLoadingFailure>> setDefaultProtoChunk(ChunkPos chpos, BlockableEventLoop<Runnable> executor, ServerLevel world);
+    //CompletableFuture<ChunkResult<ChunkAccess>> setDefaultProtoChunk(ChunkPos chpos, BlockableEventLoop<Runnable> executor, ServerLevel world);
 }