1.21.3

Author: extclp

docs/scarpet/Full.md

@@ -4301,19 +4301,15 @@ Recipe type can take one of the following options:
  * `'smithing'` - smithing table (1.16+)
 
  The return value is a list of available recipes (even if there is only one recipe available). Each recipe contains of
- an item triple of the crafting result, list of ingredients, each containing a list of possible variants of the
- ingredients in this slot, as item triples, or `null` if its a shaped recipe and a given slot in the patterns is left
+ an item triple of the crafting results as a list of item stacks, list of ingredients, each containing a list of possible variants of the
+ ingredients in this slot, as item ids, or `null` if it is a shaped recipe and a given slot in the patterns is left
  empty, and recipe specification as another list. Possible recipe specs is:
   * `['shaped', width, height]` - shaped crafting. `width` and `height` can be 1, 2 or 3.
   * `['shapeless']` - shapeless crafting
   * `['smelting', duration, xp]` - smelting/cooking recipes
   * `['cutting']` - stonecutter recipe
   * `['special']` - special crafting recipe, typically not present in the crafting menu
   * `['custom']` - other recipe types
-  
-Note that ingredients are specified as tripes, with count and nbt information. Currently all recipes require always one
-of the ingredients, and for some recipes, even if the nbt data for the ingredient is specified (e.g. `dispenser`), it
-can accept items of any tags.
 
 Also note that some recipes leave some products in the crafting window, and these can be determined using
  `crafting_remaining_item()` function 
@@ -4328,7 +4324,7 @@ Also note that some recipes leave some products in the crafting window, and thes
 ### `crafting_remaining_item(item)`
 
 returns `null` if the item has no remaining item in the crafting window when used as a crafting ingredient, or an
-item name that serves as a replacement after crafting is done. Currently it can only be buckets and glass bottles.
+item tuple that serves as a replacement after crafting is done. Currently, it can only be buckets and glass bottles.
 
 ### `inventory_size(inventory)`
 

docs/scarpet/api/Inventories.md

@@ -70,19 +70,15 @@ Recipe type can take one of the following options:
  * `'smithing'` - smithing table (1.16+)
 
  The return value is a list of available recipes (even if there is only one recipe available). Each recipe contains of
- an item triple of the crafting result, list of ingredients, each containing a list of possible variants of the
- ingredients in this slot, as item triples, or `null` if its a shaped recipe and a given slot in the patterns is left
+ an item triple of the crafting results as a list of item stacks, list of ingredients, each containing a list of possible variants of the
+ ingredients in this slot, as item ids, or `null` if it is a shaped recipe and a given slot in the patterns is left
  empty, and recipe specification as another list. Possible recipe specs is:
   * `['shaped', width, height]` - shaped crafting. `width` and `height` can be 1, 2 or 3.
   * `['shapeless']` - shapeless crafting
   * `['smelting', duration, xp]` - smelting/cooking recipes
   * `['cutting']` - stonecutter recipe
   * `['special']` - special crafting recipe, typically not present in the crafting menu
   * `['custom']` - other recipe types
-  
-Note that ingredients are specified as tripes, with count and nbt information. Currently all recipes require always one
-of the ingredients, and for some recipes, even if the nbt data for the ingredient is specified (e.g. `dispenser`), it
-can accept items of any tags.
 
 Also note that some recipes leave some products in the crafting window, and these can be determined using
  `crafting_remaining_item()` function 
@@ -97,7 +93,7 @@ Also note that some recipes leave some products in the crafting window, and thes
 ### `crafting_remaining_item(item)`
 
 returns `null` if the item has no remaining item in the crafting window when used as a crafting ingredient, or an
-item name that serves as a replacement after crafting is done. Currently it can only be buckets and glass bottles.
+item tuple that serves as a replacement after crafting is done. Currently, it can only be buckets and glass bottles.
 
 ### `inventory_size(inventory)`
 

gradle.properties

@@ -3,26 +3,26 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check https://fabricmc.net/develop/
-	minecraft_version=1.21
-	loader_version=0.15.11
+	minecraft_version=1.21.2
+	loader_version=0.16.7
 	jsr305_version=3.0.2
-	fabric_version=0.99.2+1.21
+	fabric_version=0.106.0+1.21.2
 
 # Mod Properties
-	mod_version = 1.4.147
+	mod_version = 1.4.158
 	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.21:1.21
+	release-curse-versions = Minecraft 1.21:1.21.2
 	# 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.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.4-Snapshot
+	release-extra-curse-version = Minecraft 1.20:1.20.4-Snapshot

src/main/java/carpet/CarpetSettings.java

@@ -807,7 +807,7 @@ public static class StructureBlockIgnoredValidator extends Validator<String> {
         @Override
         public String validate(CommandSourceStack source, CarpetRule<String> currentRule, String newValue, String string) {
             if (source == null) return newValue; // closing or sync
-            Optional<Block> ignoredBlock = source.registryAccess().registryOrThrow(Registries.BLOCK).getOptional(ResourceLocation.tryParse(newValue));
+            Optional<Block> ignoredBlock = source.registryAccess().lookupOrThrow(Registries.BLOCK).getOptional(ResourceLocation.tryParse(newValue));
             if (!ignoredBlock.isPresent()) {
                 Messenger.m(source, "r Unknown block '" + newValue + "'.");
                 return null;

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

@@ -290,7 +290,7 @@ public void detachServer()
     /**
      * Calling this method is not supported.
      */
-    public void inspectClientsideCommand(CommandSourceStack source, String string)
+    public void inspectClientsideCommand(String string)
     {
         if (string.startsWith("/" + identifier + " "))
         {
@@ -302,9 +302,9 @@ public void inspectClientsideCommand(CommandSourceStack source, String string)
                 if (rules.containsKey(rule) && rules.get(rule).canBeToggledClientSide())
                 {
                     try {
-                        rules.get(rule).set(source, strOption);
+                        rules.get(rule).set(null, strOption);
                     } catch (InvalidRuleValueException e) {
-                        e.notifySource(rule, source);
+                        //e.notifySource(rule, source);
                     }
                 }
             }

src/main/java/carpet/commands/PerimeterInfoCommand.java

@@ -14,6 +14,7 @@
 import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntitySpawnReason;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.Mob;
 
@@ -54,8 +55,8 @@ private static int perimeterDiagnose(CommandSourceStack source, BlockPos pos, St
         if (mobId != null)
         {
             nbttagcompound.putString("id", mobId);
-            Entity baseEntity = EntityType.loadEntityRecursive(nbttagcompound, source.getLevel(), (entity_1x) -> {
-                entity_1x.moveTo(new BlockPos(pos.getX(), source.getLevel().getMinBuildHeight()-10, pos.getZ()), entity_1x.getYRot(), entity_1x. getXRot());
+            Entity baseEntity = EntityType.loadEntityRecursive(nbttagcompound, source.getLevel(), EntitySpawnReason.COMMAND, (entity_1x) -> {
+                entity_1x.moveTo(new BlockPos(pos.getX(), source.getLevel().getMinY()-10, pos.getZ()), entity_1x.getYRot(), entity_1x. getXRot());
                 return !source.getLevel().addWithUUID(entity_1x) ? null : entity_1x;
             });
             if (!(baseEntity instanceof  Mob))

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

@@ -223,7 +223,8 @@ private static boolean cantSpawn(CommandContext<CommandSourceStack> context)
     private static int kill(CommandContext<CommandSourceStack> context)
     {
         if (cantReMove(context)) return 0;
-        getPlayer(context).kill();
+        ServerPlayer player = getPlayer(context);
+        player.kill(player.serverLevel());
         return 1;
     }
 

src/main/java/carpet/fakes/DefaultRedstoneWireEvaluatorInferface.java

@@ -0,0 +1,10 @@
+package carpet.fakes;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.Level;
+
+
+public interface DefaultRedstoneWireEvaluatorInferface
+{
+    int calculateTargetStrengthCM(final Level level, final BlockPos pos);
+}

src/main/java/carpet/fakes/RecipeManagerInterface.java

@@ -7,4 +7,5 @@
 public interface RedstoneWireBlockInterface {
     BlockState updateLogicPublic(Level world_1, BlockPos blockPos_1, BlockState blockState_1);
     void setWiresGivePower(boolean wiresGivePower);
-}
+    boolean getWiresGivePower();
+}

src/main/java/carpet/fakes/RedstoneWireBlockInterface.java

@@ -100,7 +100,7 @@ else if (block == Blocks.HOPPER)
             }
         }
         // Send block update to the block that just have been rotated.
-        world.neighborChanged(blockpos, block, source.pos());
+        world.neighborChanged(blockpos, block, null);
 
         return stack;
     }

src/main/java/carpet/helpers/BlockRotator.java

@@ -11,7 +11,7 @@
 import net.minecraft.commands.arguments.EntityAnchorArgument;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.network.protocol.game.ClientboundSetCarriedItemPacket;
+import net.minecraft.network.protocol.game.ClientboundSetHeldSlotPacket;
 import net.minecraft.network.protocol.game.ServerboundPlayerActionPacket;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
@@ -282,7 +282,7 @@ public void drop(int selectedSlot, boolean dropAll)
     public void setSlot(int slot)
     {
         player.getInventory().selected = slot-1;
-        player.connection.send(new ClientboundSetCarriedItemPacket(slot-1));
+        player.connection.send(new ClientboundSetHeldSlotPacket(slot-1));
     }
 
     public enum ActionType
@@ -314,12 +314,12 @@ boolean execute(ServerPlayer player, Action action)
                             BlockHitResult blockHit = (BlockHitResult) hit;
                             BlockPos pos = blockHit.getBlockPos();
                             Direction side = blockHit.getDirection();
-                            if (pos.getY() < player.level().getMaxBuildHeight() - (side == Direction.UP ? 1 : 0) && world.mayInteract(player, pos))
+                            if (pos.getY() < player.level().getMaxY() - (side == Direction.UP ? 1 : 0) && world.mayInteract(player, pos))
                             {
                                 InteractionResult result = player.gameMode.useItemOn(player, world, player.getItemInHand(hand), hand, blockHit);
-                                if (result.consumesAction())
+                                if (result instanceof InteractionResult.Success success)
                                 {
-                                    if (result.shouldSwing()) player.swing(hand);
+                                    if (success.swingSource() == InteractionResult.SwingSource.SERVER) player.swing(hand);
                                     ap.itemUseCooldown = 3;
                                     return true;
                                 }
@@ -402,17 +402,17 @@ boolean execute(ServerPlayer player, Action action) {
                         boolean blockBroken = false;
                         if (player.gameMode.getGameModeForPlayer().isCreative())
                         {
-                            player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, side, player.level().getMaxBuildHeight(), -1);
+                            player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
                             ap.blockHitDelay = 5;
                             blockBroken = true;
                         }
                         else  if (ap.currentBlock == null || !ap.currentBlock.equals(pos))
                         {
                             if (ap.currentBlock != null)
                             {
-                                player.gameMode.handleBlockBreakAction(ap.currentBlock, ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, side, player.level().getMaxBuildHeight(), -1);
+                                player.gameMode.handleBlockBreakAction(ap.currentBlock, ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
                             }
-                            player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, side, player.level().getMaxBuildHeight(), -1);
+                            player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.START_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
                             boolean notAir = !state.isAir();
                             if (notAir && ap.curBlockDamageMP == 0)
                             {
@@ -435,7 +435,7 @@ else  if (ap.currentBlock == null || !ap.currentBlock.equals(pos))
                             ap.curBlockDamageMP += state.getDestroyProgress(player, player.level(), pos);
                             if (ap.curBlockDamageMP >= 1)
                             {
-                                player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK, side, player.level().getMaxBuildHeight(), -1);
+                                player.gameMode.handleBlockBreakAction(pos, ServerboundPlayerActionPacket.Action.STOP_DESTROY_BLOCK, side, player.level().getMaxY(), -1);
                                 ap.currentBlock = null;
                                 ap.blockHitDelay = 5;
                                 blockBroken = true;
@@ -457,7 +457,7 @@ void inactiveTick(ServerPlayer player, Action action)
                 EntityPlayerActionPack ap = ((ServerPlayerInterface) player).getActionPack();
                 if (ap.currentBlock == null) return;
                 player.level().destroyBlockProgress(-1, ap.currentBlock, -1);
-                player.gameMode.handleBlockBreakAction(ap.currentBlock, ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.level().getMaxBuildHeight(), -1);
+                player.gameMode.handleBlockBreakAction(ap.currentBlock, ServerboundPlayerActionPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.level().getMaxY(), -1);
                 ap.currentBlock = null;
             }
         },

src/main/java/carpet/helpers/EntityPlayerActionPack.java

@@ -58,7 +58,7 @@ public default void performBonemeal(ServerLevel worldIn, RandomSource random, Bl
 
         MapColor color = blockUnder.getMapColor(worldIn, pos);
         BlockState properBlock = blockUnder;
-        HolderSet.Named<Block> coralBlocks = worldIn.registryAccess().registryOrThrow(Registries.BLOCK).getTag(BlockTags.CORAL_BLOCKS).orElseThrow();
+        HolderSet.Named<Block> coralBlocks = worldIn.registryAccess().lookupOrThrow(Registries.BLOCK).get(BlockTags.CORAL_BLOCKS).orElseThrow();
         for (Holder<Block> block: coralBlocks)
         {
             properBlock = block.value().defaultBlockState();