22w15a

gradle.properties

@@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=22w14a
+	minecraft_version=22w15a
 	loader_version=0.13.3
 	fabric_version=0.49.4+1.19
 

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

@@ -15,6 +15,7 @@ import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
 import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.util.UUIDTypeAdapter;
 import net.minecraft.commands.CommandBuildContext;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.commands.arguments.DimensionArgument;
@@ -22,6 +23,7 @@ import net.minecraft.commands.arguments.coordinates.RotationArgument;
 import net.minecraft.commands.arguments.coordinates.Vec3Argument;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
+import net.minecraft.core.UUIDUtil;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
@@ -211,7 +213,7 @@ public class PlayerCommand
                         "Banned players can only be summoned in Singleplayer and in servers in off-line mode.");
                 return true;
             } else {
-                profile = new GameProfile(Player.createPlayerUUID(playerName), playerName);
+                profile = new GameProfile(UUIDUtil.createOfflinePlayerUUID(playerName), playerName);
             }
         }
         if (manager.getBans().isBanned(profile))

src/main/java/carpet/helpers/OptimizedExplosion.java

@@ -232,7 +232,7 @@ public class OptimizedExplosion
         if (damagesTerrain)
         {
             ObjectArrayList<Pair<ItemStack, BlockPos>> objectArrayList = new ObjectArrayList<>();
-            Util.shuffle(e.getToBlow(), world.random);
+            Util.shuffle((ObjectArrayList<BlockPos>) e.getToBlow(), world.random);
 
             for (BlockPos blockpos : e.getToBlow())
             {

src/main/java/carpet/mixins/Explosion_optimizedTntMixin.java

@@ -4,6 +4,7 @@ import carpet.helpers.OptimizedExplosion;
 import carpet.CarpetSettings;
 import carpet.logging.LoggerRegistry;
 import carpet.logging.logHelpers.ExplosionLogHelper;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -28,7 +29,7 @@ public abstract class Explosion_optimizedTntMixin
 {
     @Shadow
     @Final
-    private List<BlockPos> toBlow;
+    private ObjectArrayList<BlockPos> toBlow;
 
     @Shadow @Final private Level level;
 

src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java

@@ -1,5 +1,6 @@
 package carpet.mixins;
 
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -32,7 +33,7 @@ public abstract class Explosion_scarpetEventMixin
     @Shadow @Final private double z;
     @Shadow @Final private float radius;
     @Shadow @Final private boolean fire;
-    @Shadow @Final private List<BlockPos> toBlow;
+    @Shadow @Final private ObjectArrayList<BlockPos> toBlow;
     @Shadow @Final private Explosion.BlockInteraction blockInteraction;
     @Shadow @Final private @Nullable Entity source;
 

src/main/java/carpet/mixins/LevelRenderer_scarpetRenderMixin.java

@@ -10,6 +10,8 @@ import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.RenderBuffers;
+import net.minecraft.client.renderer.blockentity.BlockEntityRenderDispatcher;
+import net.minecraft.client.renderer.entity.EntityRenderDispatcher;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -19,9 +21,9 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class LevelRenderer_scarpetRenderMixin
 {
     @Inject(method = "<init>", at = @At("RETURN"))
-    private void addRenderers(Minecraft client, RenderBuffers bufferBuilders, CallbackInfo ci)
+    private void addRenderers(Minecraft minecraft, EntityRenderDispatcher entityRenderDispatcher, BlockEntityRenderDispatcher blockEntityRenderDispatcher, RenderBuffers renderBuffers, CallbackInfo ci)
     {
-        CarpetClient.shapes = new ShapesRenderer(client);
+        CarpetClient.shapes = new ShapesRenderer(minecraft);
     }
 
     @Inject(method = "renderLevel", at =  @At(

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

@@ -2,6 +2,7 @@ package carpet.patches;
 
 import carpet.CarpetSettings;
 import com.mojang.authlib.GameProfile;
+import net.minecraft.core.UUIDUtil;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.network.protocol.PacketFlow;
@@ -51,7 +52,7 @@ public class EntityPlayerMPFake extends ServerPlayer
             {
                 return null;
             } else {
-                gameprofile = new GameProfile(Player.createPlayerUUID(username), username);
+                gameprofile = new GameProfile(UUIDUtil.createOfflinePlayerUUID(username), username);
             }
         }
         if (gameprofile.getProperties().containsKey("textures"))