24w21a - broken shapes

Author: gnembon

gradle.properties

@@ -3,7 +3,7 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check https://fabricmc.net/develop/
-	minecraft_version=24w20a
+	minecraft_version=24w21a
 	loader_version=0.15.11
 	jsr305_version=3.0.2
 	fabric_version=0.97.8+1.20.6

src/main/java/carpet/fakes/PortalProcessorInterface.java

@@ -0,0 +1,6 @@
+package carpet.fakes;
+
+public interface PortalProcessorInterface
+{
+    void setPortalTime(int time);
+}

src/main/java/carpet/mixins/ClientCommonPacketListenerImpl_customPacketMixin.java

@@ -2,6 +2,7 @@
 
 import carpet.network.CarpetClient;
 import net.minecraft.client.multiplayer.ClientCommonPacketListenerImpl;
+import net.minecraft.network.DisconnectionDetails;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.common.ClientboundCustomPayloadPacket;
 import org.spongepowered.asm.mixin.Mixin;
@@ -13,7 +14,7 @@
 public class ClientCommonPacketListenerImpl_customPacketMixin
 {
     @Inject(method = "onDisconnect", at = @At("HEAD"))
-    private void onCMDisconnected(Component reason, CallbackInfo ci)
+    private void onCMDisconnected(DisconnectionDetails reason, CallbackInfo ci)
     {
         CarpetClient.disconnect();
     }

src/main/java/carpet/mixins/Entity_scarpetEventsMixin.java

@@ -1,9 +1,12 @@
 package carpet.mixins;
 
 import carpet.fakes.EntityInterface;
+import carpet.fakes.PortalProcessorInterface;
 import carpet.script.EntityEventsGroup;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.PortalProcessor;
 import net.minecraft.world.phys.Vec3;
+import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
@@ -15,13 +18,13 @@ public abstract class Entity_scarpetEventsMixin implements EntityInterface
 {
     //@Shadow public boolean removed;
 
-    @Shadow protected int portalTime;
     @Shadow private int portalCooldown;
 
     @Shadow public abstract boolean isRemoved();
 
     @Shadow private Vec3 position, deltaMovement;
 
+    @Shadow @Nullable public PortalProcessor portalProcess;
     private boolean permanentVehicle;
 
     private final EntityEventsGroup events = new EntityEventsGroup((Entity) (Object)this);
@@ -61,13 +64,13 @@ public void setPublicNetherPortalCooldown(int what)
     @Override
     public int getPortalTimer()
     {
-        return portalTime;
+        return portalProcess.getPortalTime();
     }
 
     @Override
     public void setPortalTimer(int amount)
     {
-        portalTime = amount;
+        ((PortalProcessorInterface)portalProcess).setPortalTime(amount);
     }
 
     @Inject(method = "tick", at = @At("HEAD"))

src/main/java/carpet/mixins/LivingEntity_creativeFlyMixin.java

@@ -1,6 +1,7 @@
 package carpet.mixins;
 
 import carpet.CarpetSettings;
+import carpet.patches.EntityPlayerMPFake;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.entity.LivingEntity;
@@ -47,4 +48,12 @@ private void flyingAltSpeed(float slipperiness, CallbackInfoReturnable<Float> ci
                 cir.setReturnValue( getFlyingSpeed() * (float)CarpetSettings.creativeFlySpeed);
         }
     }
+
+    @Inject(method = "canChangeDimensions", at = @At("HEAD"), cancellable = true)
+    private void canChangeDimensions(CallbackInfoReturnable<Boolean> cir)
+    {
+        if (CarpetSettings.isCreativeFlying(this)) {
+                cir.setReturnValue(false);
+        }
+    }
 }

src/main/java/carpet/mixins/PortalProcessor_scarpetMixin.java

@@ -0,0 +1,19 @@
+package carpet.mixins;
+
+import carpet.fakes.PortalProcessorInterface;
+import net.minecraft.world.entity.PortalProcessor;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(PortalProcessor.class)
+public class PortalProcessor_scarpetMixin implements PortalProcessorInterface
+{
+
+    @Shadow private int portalTime;
+
+    @Override
+    public void setPortalTime(int time)
+    {
+        portalTime = time;
+    }
+}

src/main/java/carpet/mixins/ServerGamePacketListenerImpl_coreMixin.java

@@ -3,6 +3,7 @@
 import carpet.CarpetServer;
 import carpet.fakes.ServerGamePacketListenerImplInterface;
 import net.minecraft.network.Connection;
+import net.minecraft.network.DisconnectionDetails;
 import net.minecraft.network.chat.Component;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
@@ -26,8 +27,8 @@ public ServerGamePacketListenerImpl_coreMixin(final MinecraftServer minecraftSer
     }
 
     @Inject(method = "onDisconnect", at = @At("HEAD"))
-    private void onPlayerDisconnect(Component reason, CallbackInfo ci) {
-        CarpetServer.onPlayerLoggedOut(this.player, reason);
+    private void onPlayerDisconnect(DisconnectionDetails reason, CallbackInfo ci) {
+        CarpetServer.onPlayerLoggedOut(this.player, reason.reason());
     }
 
     @Override

src/main/java/carpet/mixins/ServerPlayer_scarpetEventMixin.java

@@ -97,20 +97,20 @@ private void setSneakingConditionally(ServerPlayer serverPlayerEntity, boolean s
     private ResourceKey<Level> previousDimension;
 
     @Inject(method = "changeDimension", at = @At("HEAD"))
-    private void logPreviousCoordinates(DimensionTransitionSupplier serverWorld, CallbackInfoReturnable<Entity> cir)
+    private void logPreviousCoordinates(DimensionTransition serverWorld, CallbackInfoReturnable<Entity> cir)
     {
         previousLocation = position();
         previousDimension = level().dimension();  //dimension type
     }
 
     @Inject(method = "changeDimension", at = @At("RETURN"))
-    private void atChangeDimension(DimensionTransitionSupplier destinationP, CallbackInfoReturnable<Entity> cir)
+    private void atChangeDimension(DimensionTransition destinationP, CallbackInfoReturnable<Entity> cir)
     {
         if (PLAYER_CHANGES_DIMENSION.isNeeded())
         {
             ServerPlayer player = (ServerPlayer) (Object)this;
-            DimensionTransition destinationTransition = destinationP.get();
-            ServerLevel destination = destinationTransition.newDimension();
+            DimensionTransition destinationTransition = destinationP;
+            ServerLevel destination = destinationTransition.newLevel();
             Vec3 to = null;
             if (!wonGame || previousDimension != Level.END || destination.dimension() != Level.OVERWORLD)
             {

src/main/java/carpet/mixins/TheEndGatewayBlockEntity_creativeNoClipMixin.java

@@ -11,9 +11,5 @@
 @Mixin(TheEndGatewayBlockEntity.class)
 public class TheEndGatewayBlockEntity_creativeNoClipMixin
 {
-    @Inject(method = "canEntityTeleport", cancellable = true, at = @At("HEAD"))
-    private static void checkFlyingCreative(Entity entity, CallbackInfoReturnable<Boolean> cir)
-    {
-        if (CarpetSettings.isCreativeFlying(entity)) cir.setReturnValue(false);
-    }
+    // removeme
 }

src/main/java/carpet/network/CarpetClient.java

@@ -45,7 +45,7 @@ public void write(FriendlyByteBuf output)
     private static LocalPlayer clientPlayer = null;
     private static boolean isServerCarpet = false;
     public static String serverCarpetVersion;
-    public static final ResourceLocation CARPET_CHANNEL = new ResourceLocation("carpet", "hello");
+    public static final ResourceLocation CARPET_CHANNEL = ResourceLocation.fromNamespaceAndPath("carpet", "hello");
 
     public static void gameJoined(LocalPlayer player)
     {

src/main/java/carpet/patches/EntityPlayerMPFake.java

@@ -4,6 +4,7 @@
 import com.mojang.authlib.GameProfile;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.UUIDUtil;
+import net.minecraft.network.DisconnectionDetails;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.contents.TranslatableContents;
 import net.minecraft.network.protocol.PacketFlow;
@@ -30,6 +31,7 @@
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.SkullBlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.portal.DimensionTransition;
 import net.minecraft.world.phys.Vec3;
 import carpet.fakes.ServerPlayerInterface;
 import carpet.utils.Messenger;
@@ -147,10 +149,10 @@ public void kill(Component reason)
         shakeOff();
 
         if (reason.getContents() instanceof TranslatableContents text && text.getKey().equals("multiplayer.disconnect.duplicate_login")) {
-            this.connection.onDisconnect(reason);
+            this.connection.onDisconnect(new DisconnectionDetails(reason));
         } else {
             this.server.tell(new TickTask(this.server.getTickCount(), () -> {
-                this.connection.onDisconnect(reason);
+                this.connection.onDisconnect(new DisconnectionDetails(reason));
             }));
         }
     }
@@ -213,7 +215,7 @@ protected void checkFallDamage(double y, boolean onGround, BlockState state, Blo
     }
 
     @Override
-    public Entity changeDimension(DimensionTransitionSupplier serverLevel)
+    public Entity changeDimension(DimensionTransition serverLevel)
     {
         super.changeDimension(serverLevel);
         if (wonGame) {

src/main/java/carpet/script/command/CommandArgument.java

@@ -890,7 +890,7 @@ protected void configure(Map<String, Value> config, CarpetScriptHost host) throw
                 {
                     throw error("Custom sting type requires options passed as a list" + " for custom type " + suffix);
                 }
-                validOptions = ((ListValue) optionsValue).getItems().stream().map(v -> new ResourceLocation(v.getString())).collect(Collectors.toSet());
+                validOptions = ((ListValue) optionsValue).getItems().stream().map(v -> ResourceLocation.parse(v.getString())).collect(Collectors.toSet());
             }
         }
     }

src/main/java/carpet/script/utils/FeatureGenerator.java

@@ -75,7 +75,7 @@ public static synchronized Boolean plop(String featureName, ServerLevel world, B
         {
             return custom.apply(world).plop(world, pos);
         }
-        ResourceLocation id = new ResourceLocation(featureName);
+        ResourceLocation id = ResourceLocation.parse(featureName);
         Structure structure = world.registryAccess().registryOrThrow(Registries.STRUCTURE).get(id);
         if (structure != null)
         {
@@ -129,7 +129,7 @@ public static synchronized Boolean plop(String featureName, ServerLevel world, B
     @Nullable
     public static Structure resolveConfiguredStructure(String name, ServerLevel world, BlockPos pos)
     {
-        ResourceLocation id = new ResourceLocation(name);
+        ResourceLocation id = ResourceLocation.parse(name);
         Structure configuredStructureFeature = world.registryAccess().registryOrThrow(Registries.STRUCTURE).get(id);
         if (configuredStructureFeature != null)
         {

src/main/java/carpet/script/utils/InputValidator.java

@@ -23,7 +23,7 @@ public static ResourceLocation identifierOf(String string)
     {
         try
         {
-            return new ResourceLocation(string);
+            return ResourceLocation.parse(string);
         }
         catch (ResourceLocationException iie)
         {

src/main/java/carpet/script/utils/ShapeDispatcher.java

@@ -375,7 +375,7 @@ protected void init(Map<String, Value> options, RegistryAccess regs)
 
             key = 0;
             followEntity = -1;
-            shapeDimension = ResourceKey.create(Registries.DIMENSION, new ResourceLocation(options.get("dim").getString()));
+            shapeDimension = ResourceKey.create(Registries.DIMENSION, ResourceLocation.parse(options.get("dim").getString()));
             if (options.containsKey("follow"))
             {
                 followEntity = NumericValue.asNumber(options.getOrDefault("follow", optional.get("follow"))).getInt();