From: Irtimaled Date: Tue, 6 Aug 2019 05:16:12 +0000 (-0700) Subject: Setup for 1.15.2-Fabric X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=35e229da110ab71373b6f6e2e4df3628c1f479c1;p=BoundingBoxOutlineReloaded.git Setup for 1.15.2-Fabric --- diff --git a/build.gradle b/build.gradle index 0b9a651..e8e912f 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ targetCompatibility = 1.8 dependencies { minecraft 'com.mojang:minecraft:' + project.mcVersion - mappings 'net.fabricmc:yarn:' + project.mcVersion + '+build.16' + mappings 'net.fabricmc:yarn:' + project.mcVersion + '+build.9' modCompile 'net.fabricmc:fabric-loader:0.8.3+build.196' } diff --git a/gradle.properties b/gradle.properties index a753f0c..a6f2081 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ name=bbor buildVersion=2.4 # leave a space to reduce merge conflicts on version change -mcVersion=1.14.4 +mcVersion=1.15.2 diff --git a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java index 72a0a81..2716d12 100644 --- a/src/main/java/com/irtimaled/bbor/client/ClientProxy.java +++ b/src/main/java/com/irtimaled/bbor/client/ClientProxy.java @@ -7,7 +7,9 @@ import com.irtimaled.bbor.client.gui.SettingsScreen; import com.irtimaled.bbor.client.interop.FlowerForestHelper; import com.irtimaled.bbor.client.keyboard.Key; import com.irtimaled.bbor.client.keyboard.KeyListener; -import com.irtimaled.bbor.client.providers.*; +import com.irtimaled.bbor.client.providers.CacheProvider; +import com.irtimaled.bbor.client.providers.SlimeChunkProvider; +import com.irtimaled.bbor.client.providers.WorldSpawnProvider; import com.irtimaled.bbor.common.BoundingBoxCache; import com.irtimaled.bbor.common.CommonProxy; import com.irtimaled.bbor.common.EventBus; diff --git a/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java b/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java index 68788d1..7cf1418 100644 --- a/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/ClientRenderer.java @@ -97,6 +97,17 @@ public class ClientRenderer { RenderHelper.afterRender(); } + public static void renderDeferred() { + RenderHelper.beforeRender(); + RenderHelper.polygonModeFill(); + RenderHelper.enableBlend(); + RenderQueue.renderDeferred(); + RenderHelper.disableBlend(); + RenderHelper.enablePolygonOffsetLine(); + RenderHelper.polygonOffsetMinusOne(); + RenderHelper.afterRender(); + } + public static Stream getBoundingBoxes(DimensionId dimensionId) { Stream.Builder boundingBoxes = Stream.builder(); for (IBoundingBoxProvider provider : providers) { diff --git a/src/main/java/com/irtimaled/bbor/client/Player.java b/src/main/java/com/irtimaled/bbor/client/Player.java index f6db9a2..f468be0 100644 --- a/src/main/java/com/irtimaled/bbor/client/Player.java +++ b/src/main/java/com/irtimaled/bbor/client/Player.java @@ -13,9 +13,9 @@ public class Player { private static DimensionId dimensionId; public static void setPosition(double partialTicks, ClientPlayerEntity player) { - x = player.prevX + (player.x - player.prevX) * partialTicks; - y = player.prevY + (player.y - player.prevY) * partialTicks; - z = player.prevZ + (player.z - player.prevZ) * partialTicks; + x = player.prevX + (player.getX() - player.prevX) * partialTicks; + y = player.prevY + (player.getY() - player.prevY) * partialTicks; + z = player.prevZ + (player.getZ() - player.prevZ) * partialTicks; dimensionId = DimensionId.from(player.dimension); } diff --git a/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java b/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java index 9f3709c..ddd0956 100644 --- a/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java +++ b/src/main/java/com/irtimaled/bbor/client/interop/ClientInterop.java @@ -33,6 +33,10 @@ public class ClientInterop { ClientRenderer.render(DimensionId.from(player.dimension)); } + public static void renderDeferred() { + ClientRenderer.renderDeferred(); + } + public static boolean interceptChatMessage(String message) { if (message.startsWith("/bbor:")) { ClientPlayNetworkHandler connection = MinecraftClient.getInstance().getNetworkHandler(); diff --git a/src/main/java/com/irtimaled/bbor/client/interop/FlowerForestHelper.java b/src/main/java/com/irtimaled/bbor/client/interop/FlowerForestHelper.java index 270a29c..be5189b 100644 --- a/src/main/java/com/irtimaled/bbor/client/interop/FlowerForestHelper.java +++ b/src/main/java/com/irtimaled/bbor/client/interop/FlowerForestHelper.java @@ -10,6 +10,7 @@ import net.minecraft.client.MinecraftClient; import net.minecraft.util.math.BlockPos; import net.minecraft.world.biome.Biomes; import net.minecraft.world.gen.feature.DecoratedFeatureConfig; +import net.minecraft.world.gen.feature.FeatureConfig; import net.minecraft.world.gen.feature.FlowerFeature; import java.util.HashMap; @@ -21,6 +22,7 @@ public class FlowerForestHelper { private static final Map> flowerColorMap = new HashMap<>(); private static final FlowerFeature flowersFeature; + private static final FeatureConfig flowersConfig; static { flowerColorMap.put(Blocks.DANDELION.getDefaultState(), ConfigManager.colorFlowerForestDandelion); @@ -37,12 +39,13 @@ public class FlowerForestHelper { DecoratedFeatureConfig config = (DecoratedFeatureConfig) Biomes.FLOWER_FOREST.getFlowerFeatures().get(0).config; flowersFeature = (FlowerFeature) config.feature.feature; + flowersConfig = config.feature.config; } public static Setting getFlowerColorAtPos(Coords coords) { int x = coords.getX(); int z = coords.getZ(); - BlockState blockState = flowersFeature.getFlowerToPlace(random, new BlockPos(x, coords.getY(), z)); + BlockState blockState = flowersFeature.getFlowerToPlace(random, new BlockPos(x, coords.getY(), z), flowersConfig); return flowerColorMap.get(blockState); } diff --git a/src/main/java/com/irtimaled/bbor/client/interop/NBTStructureLoader.java b/src/main/java/com/irtimaled/bbor/client/interop/NBTStructureLoader.java index d067a0b..e3cf56d 100644 --- a/src/main/java/com/irtimaled/bbor/client/interop/NBTStructureLoader.java +++ b/src/main/java/com/irtimaled/bbor/client/interop/NBTStructureLoader.java @@ -1,6 +1,7 @@ package com.irtimaled.bbor.client.interop; import com.irtimaled.bbor.common.EventBus; +import com.irtimaled.bbor.common.ReflectionHelper; import com.irtimaled.bbor.common.events.StructuresLoaded; import com.irtimaled.bbor.common.models.DimensionId; import net.minecraft.nbt.CompoundTag; @@ -22,6 +23,7 @@ import net.minecraft.world.storage.RegionBasedStorage; import java.io.File; import java.io.IOException; import java.util.*; +import java.util.function.Function; class NBTStructureLoader { private final DimensionId dimensionId; @@ -108,7 +110,6 @@ class NBTStructureLoader { super(null, 0, 0, - null, new BlockBox(compound.getIntArray("BB")), 0, 0); @@ -137,24 +138,28 @@ class NBTStructureLoader { } @Override - public boolean generate(IWorld iWorld, Random random, BlockBox blockBox, ChunkPos chunkPos) { + public boolean generate(IWorld iWorld, ChunkGenerator chunkGenerator, Random random, BlockBox blockBox, ChunkPos chunkPos) { return false; } } private static class ChunkLoader { + private static final Function creator = + ReflectionHelper.getPrivateInstanceBuilder(RegionBasedStorage.class, File.class); + private final RegionBasedStorage regionFileCache; public ChunkLoader(File file) { - this.regionFileCache = new RegionBasedStorage(file) { - }; + this.regionFileCache = creator.apply(file); } public CompoundTag readChunk(int chunkX, int chunkZ) throws IOException { + if (regionFileCache == null) return null; return regionFileCache.getTagAt(new ChunkPos(chunkX, chunkZ)); } public void close() throws IOException { + if (regionFileCache == null) return; regionFileCache.close(); } } diff --git a/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java b/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java index 2e7d30d..021572c 100644 --- a/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java +++ b/src/main/java/com/irtimaled/bbor/client/keyboard/KeyListener.java @@ -16,7 +16,7 @@ public class KeyListener { public static final String Category = "Bounding Box Outline Reloaded"; public static void init() { - mainWindowHandle = minecraft.window.getHandle(); + mainWindowHandle = minecraft.getWindow().getHandle(); GLFW.glfwSetKeyCallback(mainWindowHandle, KeyListener::onKeyEvent); } diff --git a/src/main/java/com/irtimaled/bbor/client/providers/BedrockCeilingProvider.java b/src/main/java/com/irtimaled/bbor/client/providers/BedrockCeilingProvider.java index 3278be4..b7c5a37 100644 --- a/src/main/java/com/irtimaled/bbor/client/providers/BedrockCeilingProvider.java +++ b/src/main/java/com/irtimaled/bbor/client/providers/BedrockCeilingProvider.java @@ -2,7 +2,6 @@ package com.irtimaled.bbor.client.providers; import com.irtimaled.bbor.client.Player; import com.irtimaled.bbor.client.config.BoundingBoxTypeHelper; -import com.irtimaled.bbor.client.config.ConfigManager; import com.irtimaled.bbor.client.interop.BedrockCeilingHelper; import com.irtimaled.bbor.client.interop.ClientInterop; import com.irtimaled.bbor.client.models.BoundingBoxBedrockCeiling; diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java index 907c0a9..bd92c2b 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/AbstractRenderer.java @@ -111,13 +111,7 @@ public abstract class AbstractRenderer { void renderFilledFaces(OffsetPoint min, OffsetPoint max, Color color, int alpha) { if (!ConfigManager.fill.get()) return; - - RenderHelper.polygonModeFill(); - RenderHelper.enableBlend(); - renderFaces(min, max, color, alpha, Renderer::startQuads); - RenderHelper.disableBlend(); - RenderHelper.enablePolygonOffsetLine(); - RenderHelper.polygonOffsetMinusOne(); + RenderQueue.deferRendering(() -> renderFaces(min, max, color, alpha, Renderer::startQuads)); } void renderText(OffsetPoint offsetPoint, String... texts) { diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/LineRenderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/LineRenderer.java index 66f26cc..a769ebf 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/LineRenderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/LineRenderer.java @@ -30,16 +30,10 @@ public class LineRenderer extends AbstractRenderer { .render(); if (!ConfigManager.fill.get()) return; - - RenderHelper.polygonModeFill(); - RenderHelper.enableBlend(); - Renderer.startQuads() + RenderQueue.deferRendering(() -> Renderer.startQuads() .setColor(color) .setAlpha(30) .addPoints(cornerPoints) - .render(); - RenderHelper.disableBlend(); - RenderHelper.enablePolygonOffsetLine(); - RenderHelper.polygonOffsetMinusOne(); + .render()); } } diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/RenderQueue.java b/src/main/java/com/irtimaled/bbor/client/renderers/RenderQueue.java new file mode 100644 index 0000000..9f6e68c --- /dev/null +++ b/src/main/java/com/irtimaled/bbor/client/renderers/RenderQueue.java @@ -0,0 +1,23 @@ +package com.irtimaled.bbor.client.renderers; + +import java.util.Queue; +import java.util.concurrent.ConcurrentLinkedQueue; + +public class RenderQueue { + private static final Queue queue = new ConcurrentLinkedQueue<>(); + + public static void deferRendering(RenderAction action) { + queue.add(action); + } + + public static void renderDeferred() { + while (!queue.isEmpty()) { + queue.poll().render(); + } + } + + @FunctionalInterface + public interface RenderAction { + void render(); + } +} \ No newline at end of file diff --git a/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java b/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java index 806731a..104eda4 100644 --- a/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java +++ b/src/main/java/com/irtimaled/bbor/client/renderers/Renderer.java @@ -100,7 +100,7 @@ public class Renderer { } private void tex(double u, double v) { - bufferBuilder.texture(u, v); + bufferBuilder.texture((float) u, (float) v); } private void color() { diff --git a/src/main/java/com/irtimaled/bbor/common/ReflectionHelper.java b/src/main/java/com/irtimaled/bbor/common/ReflectionHelper.java index 2911751..a350d45 100644 --- a/src/main/java/com/irtimaled/bbor/common/ReflectionHelper.java +++ b/src/main/java/com/irtimaled/bbor/common/ReflectionHelper.java @@ -1,5 +1,6 @@ package com.irtimaled.bbor.common; +import java.lang.reflect.Constructor; import java.lang.reflect.Field; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; @@ -50,4 +51,26 @@ public class ReflectionHelper { } return true; } + + public static Function getPrivateInstanceBuilder(Class clazz, Class parameter) { + Constructor constructor = findConstructor(clazz, parameter); + if (constructor == null) return obj -> null; + + constructor.setAccessible(true); + return obj -> { + try { + return (R) constructor.newInstance(obj); + } catch (Exception ignored) { + return null; + } + }; + } + + private static Constructor findConstructor(Class clazz, Class... parameters) { + try { + return clazz.getDeclaredConstructor(parameters); + } catch (NoSuchMethodException ignored) { + return null; + } + } } diff --git a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java index 879eba1..92ff557 100644 --- a/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java +++ b/src/main/java/com/irtimaled/bbor/common/interop/CommonInterop.java @@ -39,7 +39,7 @@ public class CommonInterop { ServerPlayNetworkHandler connection = player.networkHandler; if (connection == null) return; - ClientConnection networkManager = connection.connection; + ClientConnection networkManager = connection.client; if (networkManager.isLocal()) return; EventBus.publish(new PlayerLoggedIn(new ServerPlayer(player))); diff --git a/src/main/java/com/irtimaled/bbor/common/messages/PayloadBuilder.java b/src/main/java/com/irtimaled/bbor/common/messages/PayloadBuilder.java index 831676c..8606a07 100644 --- a/src/main/java/com/irtimaled/bbor/common/messages/PayloadBuilder.java +++ b/src/main/java/com/irtimaled/bbor/common/messages/PayloadBuilder.java @@ -3,9 +3,9 @@ package com.irtimaled.bbor.common.messages; import com.irtimaled.bbor.common.models.Coords; import com.irtimaled.bbor.common.models.DimensionId; import io.netty.buffer.Unpooled; +import net.minecraft.client.network.packet.CustomPayloadS2CPacket; import net.minecraft.network.Packet; -import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket; -import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket; +import net.minecraft.server.network.packet.CustomPayloadC2SPacket; import net.minecraft.util.Identifier; import net.minecraft.util.PacketByteBuf; diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/MixinMinecraft.java b/src/main/java/com/irtimaled/bbor/mixin/client/MixinMinecraft.java index ef0643c..27c751d 100644 --- a/src/main/java/com/irtimaled/bbor/mixin/client/MixinMinecraft.java +++ b/src/main/java/com/irtimaled/bbor/mixin/client/MixinMinecraft.java @@ -18,16 +18,14 @@ public class MixinMinecraft { @Shadow @Final private ResourcePackManager resourcePackManager; - private ClientProxy clientProxy; @Inject(method = "", at = @At("RETURN")) private void constructor(RunArgs configuration, CallbackInfo ci) { - clientProxy = new ClientProxy(); - this.resourcePackManager.registerProvider(new ModPackFinder()); + new ClientProxy().init(); } - @Inject(method = "init", at = @At("RETURN")) + @Inject(method = "startTimerHackThread", at = @At("RETURN")) private void init(CallbackInfo ci) { - clientProxy.init(); + this.resourcePackManager.registerProvider(new ModPackFinder()); } } diff --git a/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinGameRenderer.java b/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinGameRenderer.java index 9ab3ffc..b58b9a5 100644 --- a/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinGameRenderer.java +++ b/src/main/java/com/irtimaled/bbor/mixin/client/renderer/MixinGameRenderer.java @@ -2,7 +2,12 @@ package com.irtimaled.bbor.mixin.client.renderer; import com.irtimaled.bbor.client.interop.ClientInterop; import net.minecraft.client.MinecraftClient; +import net.minecraft.client.render.Camera; import net.minecraft.client.render.GameRenderer; +import net.minecraft.client.render.LightmapTextureManager; +import net.minecraft.client.render.WorldRenderer; +import net.minecraft.client.util.math.Matrix4f; +import net.minecraft.client.util.math.MatrixStack; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -10,14 +15,19 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -@Mixin(GameRenderer.class) +@Mixin(WorldRenderer.class) public class MixinGameRenderer { @Shadow @Final private MinecraftClient client; - @Inject(method = "renderCenter(FJ)V", at = @At(value = "INVOKE_STRING", target = "Lnet/minecraft/util/profiler/Profiler;swap(Ljava/lang/String;)V", args = "ldc=hand", shift = At.Shift.BEFORE)) - private void render(float partialTicks, long ignored, CallbackInfo ci) { + @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/debug/DebugRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider$Immediate;DDD)V", shift = At.Shift.BEFORE)) + private void renderFirst(MatrixStack ignored_1, float partialTicks, long ignored_2, boolean ignored_3, Camera ignored_4, GameRenderer ignored_5, LightmapTextureManager ignored_6, Matrix4f ignored_7, CallbackInfo ci) { ClientInterop.render(partialTicks, this.client.player); } + + @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/WorldRenderer;renderChunkDebugInfo(Lnet/minecraft/client/render/Camera;)V", shift = At.Shift.BEFORE)) + private void render(MatrixStack ignored_1, float partialTicks, long ignored_2, boolean ignored_3, Camera ignored_4, GameRenderer ignored_5, LightmapTextureManager ignored_6, Matrix4f ignored_7, CallbackInfo ci) { + ClientInterop.renderDeferred(); + } } diff --git a/src/main/java/com/irtimaled/bbor/mixin/network/play/client/MixinCCustomPayloadPacket.java b/src/main/java/com/irtimaled/bbor/mixin/network/play/client/MixinCCustomPayloadPacket.java index 5f595c3..b76ad0f 100644 --- a/src/main/java/com/irtimaled/bbor/mixin/network/play/client/MixinCCustomPayloadPacket.java +++ b/src/main/java/com/irtimaled/bbor/mixin/network/play/client/MixinCCustomPayloadPacket.java @@ -3,8 +3,8 @@ package com.irtimaled.bbor.mixin.network.play.client; import com.irtimaled.bbor.common.interop.CommonInterop; import com.irtimaled.bbor.common.messages.SubscribeToServer; import net.minecraft.network.listener.ServerPlayPacketListener; -import net.minecraft.network.packet.c2s.play.CustomPayloadC2SPacket; import net.minecraft.server.network.ServerPlayNetworkHandler; +import net.minecraft.server.network.packet.CustomPayloadC2SPacket; import net.minecraft.util.Identifier; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -16,7 +16,7 @@ public class MixinCCustomPayloadPacket { @Shadow private Identifier channel; - @Redirect(method = "apply", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/listener/ServerPlayPacketListener;onCustomPayload(Lnet/minecraft/network/packet/c2s/play/CustomPayloadC2SPacket;)V")) + @Redirect(method = "apply", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/listener/ServerPlayPacketListener;onCustomPayload(Lnet/minecraft/server/network/packet/CustomPayloadC2SPacket;)V")) private void processPacket(ServerPlayPacketListener netHandlerPlayServer, CustomPayloadC2SPacket packet) { if (this.channel.toString().equals(SubscribeToServer.NAME)) { CommonInterop.playerSubscribed(((ServerPlayNetworkHandler) netHandlerPlayServer).player); diff --git a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSChatPacket.java b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSChatPacket.java index ec61484..f98d52b 100644 --- a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSChatPacket.java +++ b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSChatPacket.java @@ -1,7 +1,7 @@ package com.irtimaled.bbor.mixin.network.play.server; import com.irtimaled.bbor.client.interop.ClientInterop; -import net.minecraft.network.packet.s2c.play.ChatMessageS2CPacket; +import net.minecraft.client.network.packet.ChatMessageS2CPacket; import net.minecraft.text.Text; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSChunkDataPacket.java b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSChunkDataPacket.java index 703e23e..0527682 100644 --- a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSChunkDataPacket.java +++ b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSChunkDataPacket.java @@ -1,8 +1,8 @@ package com.irtimaled.bbor.mixin.network.play.server; import com.irtimaled.bbor.client.interop.ClientInterop; +import net.minecraft.client.network.packet.ChunkDataS2CPacket; import net.minecraft.network.listener.ClientPlayPacketListener; -import net.minecraft.network.packet.s2c.play.ChunkDataS2CPacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCommandListPacket.java b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCommandListPacket.java index 8496150..1a4f8d1 100644 --- a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCommandListPacket.java +++ b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCommandListPacket.java @@ -3,8 +3,8 @@ package com.irtimaled.bbor.mixin.network.play.server; import com.irtimaled.bbor.client.interop.ClientInterop; import com.irtimaled.bbor.common.TypeHelper; import net.minecraft.client.network.ClientPlayNetworkHandler; +import net.minecraft.client.network.packet.CommandTreeS2CPacket; import net.minecraft.network.listener.ClientPlayPacketListener; -import net.minecraft.network.packet.s2c.play.CommandTreeS2CPacket; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCustomPayloadPlayPacket.java b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCustomPayloadPlayPacket.java index 2ed87c3..2bccd1c 100644 --- a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCustomPayloadPlayPacket.java +++ b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSCustomPayloadPlayPacket.java @@ -6,8 +6,8 @@ import com.irtimaled.bbor.common.messages.InitializeClient; import com.irtimaled.bbor.common.messages.PayloadReader; import com.irtimaled.bbor.common.messages.SubscribeToServer; import net.minecraft.client.network.ClientPlayNetworkHandler; +import net.minecraft.client.network.packet.CustomPayloadS2CPacket; import net.minecraft.network.listener.ClientPlayPacketListener; -import net.minecraft.network.packet.s2c.play.CustomPayloadS2CPacket; import net.minecraft.util.Identifier; import net.minecraft.util.PacketByteBuf; import org.spongepowered.asm.mixin.Mixin; @@ -20,7 +20,7 @@ public abstract class MixinSCustomPayloadPlayPacket { @Shadow private Identifier channel; - @Redirect(method = "apply", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/listener/ClientPlayPacketListener;onCustomPayload(Lnet/minecraft/network/packet/s2c/play/CustomPayloadS2CPacket;)V")) + @Redirect(method = "apply", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/listener/ClientPlayPacketListener;onCustomPayload(Lnet/minecraft/client/network/packet/CustomPayloadS2CPacket;)V")) private void processPacket(ClientPlayPacketListener netHandlerPlayClient, CustomPayloadS2CPacket packet) { String channelName = channel.toString(); if (channelName.startsWith("bbor:")) { diff --git a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSSpawnPositionPacket.java b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSSpawnPositionPacket.java index 36afaa9..ac684e5 100644 --- a/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSSpawnPositionPacket.java +++ b/src/main/java/com/irtimaled/bbor/mixin/network/play/server/MixinSSpawnPositionPacket.java @@ -1,7 +1,7 @@ package com.irtimaled.bbor.mixin.network.play.server; import com.irtimaled.bbor.client.interop.ClientInterop; -import net.minecraft.network.packet.s2c.play.PlayerSpawnPositionS2CPacket; +import net.minecraft.client.network.packet.PlayerSpawnPositionS2CPacket; import net.minecraft.util.math.BlockPos; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow;