From e5af397e22f1c7aaaaf00d9a679875c44fc4d2c8 Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 13 Apr 2022 21:10:24 +0200 Subject: [PATCH] 22w15a --- gradle.properties | 2 +- src/main/java/carpet/commands/PlayerCommand.java | 4 +++- src/main/java/carpet/helpers/OptimizedExplosion.java | 2 +- .../java/carpet/mixins/Explosion_optimizedTntMixin.java | 3 ++- .../java/carpet/mixins/Explosion_scarpetEventMixin.java | 3 ++- .../carpet/mixins/LevelRenderer_scarpetRenderMixin.java | 6 ++++-- src/main/java/carpet/patches/EntityPlayerMPFake.java | 3 ++- 7 files changed, 15 insertions(+), 8 deletions(-) diff --git a/gradle.properties b/gradle.properties index 1f8a11d4..f75c49af 100644 --- a/gradle.properties +++ b/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 diff --git a/src/main/java/carpet/commands/PlayerCommand.java b/src/main/java/carpet/commands/PlayerCommand.java index bd84853f..2781b55d 100644 --- a/src/main/java/carpet/commands/PlayerCommand.java +++ b/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)) diff --git a/src/main/java/carpet/helpers/OptimizedExplosion.java b/src/main/java/carpet/helpers/OptimizedExplosion.java index 43f17d8a..efc4eef9 100644 --- a/src/main/java/carpet/helpers/OptimizedExplosion.java +++ b/src/main/java/carpet/helpers/OptimizedExplosion.java @@ -232,7 +232,7 @@ public class OptimizedExplosion if (damagesTerrain) { ObjectArrayList> objectArrayList = new ObjectArrayList<>(); - Util.shuffle(e.getToBlow(), world.random); + Util.shuffle((ObjectArrayList) e.getToBlow(), world.random); for (BlockPos blockpos : e.getToBlow()) { diff --git a/src/main/java/carpet/mixins/Explosion_optimizedTntMixin.java b/src/main/java/carpet/mixins/Explosion_optimizedTntMixin.java index 3d24cf20..97b81263 100644 --- a/src/main/java/carpet/mixins/Explosion_optimizedTntMixin.java +++ b/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 toBlow; + private ObjectArrayList toBlow; @Shadow @Final private Level level; diff --git a/src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java b/src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java index 97ad1e70..dd231b14 100644 --- a/src/main/java/carpet/mixins/Explosion_scarpetEventMixin.java +++ b/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 toBlow; + @Shadow @Final private ObjectArrayList toBlow; @Shadow @Final private Explosion.BlockInteraction blockInteraction; @Shadow @Final private @Nullable Entity source; diff --git a/src/main/java/carpet/mixins/LevelRenderer_scarpetRenderMixin.java b/src/main/java/carpet/mixins/LevelRenderer_scarpetRenderMixin.java index 33dd4846..be3db65a 100644 --- a/src/main/java/carpet/mixins/LevelRenderer_scarpetRenderMixin.java +++ b/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 = "", 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( diff --git a/src/main/java/carpet/patches/EntityPlayerMPFake.java b/src/main/java/carpet/patches/EntityPlayerMPFake.java index 2156e9f9..19354969 100644 --- a/src/main/java/carpet/patches/EntityPlayerMPFake.java +++ b/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"))