From d7468ac5610bcd07d668f08fd2f370f9902b458d Mon Sep 17 00:00:00 2001
From: gnembon <41132274+gnembon@users.noreply.github.com>
Date: Wed, 27 Mar 2024 21:57:05 +0100
Subject: [PATCH] 24w13a

---
 gradle.properties                                      |  2 +-
 .../mixins/PistonMovingBlockEntity_movableBEMixin.java |  4 ++--
 .../mixins/StructureBlockEntity_limitsMixin.java       |  4 ++--
 src/main/java/carpet/script/api/WorldAccess.java       |  2 +-
 src/main/java/carpet/script/utils/ShapesRenderer.java  |  2 +-
 src/main/java/carpet/utils/Messenger.java              | 10 +++++++++-
 6 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 430166c8..d3ba4bd9 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check https://fabricmc.net/develop/
-	minecraft_version=24w12a
+	minecraft_version=24w13a
 	loader_version=0.15.7
 	jsr305_version=3.0.2
 	fabric_version=0.96.9+1.20.5
diff --git a/src/main/java/carpet/mixins/PistonMovingBlockEntity_movableBEMixin.java b/src/main/java/carpet/mixins/PistonMovingBlockEntity_movableBEMixin.java
index 45fd6c97..b7d01d79 100644
--- a/src/main/java/carpet/mixins/PistonMovingBlockEntity_movableBEMixin.java
+++ b/src/main/java/carpet/mixins/PistonMovingBlockEntity_movableBEMixin.java
@@ -133,7 +133,7 @@ public abstract class PistonMovingBlockEntity_movableBEMixin extends BlockEntity
         }
     }
     
-    @Inject(method = "load", at = @At(value = "TAIL"))
+    @Inject(method = "loadAdditional", at = @At(value = "TAIL"))
     private void onFromTag(CompoundTag NbtCompound_1, HolderLookup.Provider registries, CallbackInfo ci)
     {
         if (CarpetSettings.movableBlockEntities && NbtCompound_1.contains("carriedTileEntityCM", 10))
@@ -141,7 +141,7 @@ public abstract class PistonMovingBlockEntity_movableBEMixin extends BlockEntity
             if (this.movedState.getBlock() instanceof EntityBlock)
                 this.carriedBlockEntity = ((EntityBlock) (this.movedState.getBlock())).newBlockEntity(worldPosition, movedState);//   this.world);
             if (carriedBlockEntity != null) //Can actually be null, as BlockPistonMoving.createNewTileEntity(...) returns null
-                this.carriedBlockEntity.load(NbtCompound_1.getCompound("carriedTileEntityCM"), registries);
+                this.carriedBlockEntity.loadWithComponents(NbtCompound_1.getCompound("carriedTileEntityCM"), registries);
             setCarriedBlockEntity(carriedBlockEntity);
         }
     }
diff --git a/src/main/java/carpet/mixins/StructureBlockEntity_limitsMixin.java b/src/main/java/carpet/mixins/StructureBlockEntity_limitsMixin.java
index 340be4c3..f0c758bb 100644
--- a/src/main/java/carpet/mixins/StructureBlockEntity_limitsMixin.java
+++ b/src/main/java/carpet/mixins/StructureBlockEntity_limitsMixin.java
@@ -13,7 +13,7 @@ import org.spongepowered.asm.mixin.injection.ModifyConstant;
 public abstract class StructureBlockEntity_limitsMixin
 {
     @ModifyConstant(
-            method = "load",
+            method = "loadAdditional",
             constant = @Constant(intValue = StructureBlockEntity.MAX_SIZE_PER_AXIS)
     )
     private int positiveLimit(int original) {
@@ -21,7 +21,7 @@ public abstract class StructureBlockEntity_limitsMixin
     }
 
     @ModifyConstant(
-            method = "load",
+            method = "loadAdditional",
             constant = @Constant(intValue = -StructureBlockEntity.MAX_SIZE_PER_AXIS)
     )
     private int negativeLimit(int original) {
diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java
index 3d730241..20af3239 100644
--- a/src/main/java/carpet/script/api/WorldAccess.java
+++ b/src/main/java/carpet/script/api/WorldAccess.java
@@ -828,7 +828,7 @@ public class WorldAccess
                         destTag.putInt("x", targetPos.getX());
                         destTag.putInt("y", targetPos.getY());
                         destTag.putInt("z", targetPos.getZ());
-                        be.load(destTag, world.registryAccess());
+                        be.loadWithComponents(destTag, world.registryAccess());
                         be.setChanged();
                         success = true;
                     }
diff --git a/src/main/java/carpet/script/utils/ShapesRenderer.java b/src/main/java/carpet/script/utils/ShapesRenderer.java
index a36d9edf..c044170b 100644
--- a/src/main/java/carpet/script/utils/ShapesRenderer.java
+++ b/src/main/java/carpet/script/utils/ShapesRenderer.java
@@ -433,7 +433,7 @@ public class ShapesRenderer
                             BlockEntity.setLevel(client.level);
                             if (shape.blockEntity != null)
                             {
-                                BlockEntity.load(shape.blockEntity, client.level.registryAccess());
+                                BlockEntity.loadWithComponents(shape.blockEntity, client.level.registryAccess());
                             }
                         }
                     }
diff --git a/src/main/java/carpet/utils/Messenger.java b/src/main/java/carpet/utils/Messenger.java
index 1823157f..36af4c17 100644
--- a/src/main/java/carpet/utils/Messenger.java
+++ b/src/main/java/carpet/utils/Messenger.java
@@ -55,7 +55,15 @@ public class Messenger
         BLACK       ('k', (s, f) -> s.withColor(ChatFormatting.BLACK)),
 
         COLOR       ('#', (s, f) -> {
-            TextColor color = TextColor.parseColor("#"+f).getOrThrow(false, LOG::warn);
+            TextColor color;
+            try
+            {
+                color = TextColor.parseColor("#" + f).getOrThrow(RuntimeException::new);
+            }
+            catch (RuntimeException e)
+            {
+                return s;
+            }
             return color == null ? s : s.withColor(color);
         }, s -> {
             Matcher m = colorExtract.matcher(s);