Merge branch '1.18/dev' into 1.19/dev

This commit is contained in:
PepperCode1 2023-08-23 15:04:41 -07:00
commit 62c8c43a34
2 changed files with 2 additions and 2 deletions

View file

@ -13,7 +13,7 @@ import net.minecraft.world.level.block.entity.BlockEntity;
@Mixin(value = ChunkRenderRebuildTask.class, remap = false) @Mixin(value = ChunkRenderRebuildTask.class, remap = false)
public class ChunkRenderRebuildTaskMixin { public class ChunkRenderRebuildTaskMixin {
@Redirect(method = "performBuild", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/blockentity/BlockEntityRenderDispatcher;getRenderer(Lnet/minecraft/world/level/block/entity/BlockEntity;)Lnet/minecraft/client/renderer/blockentity/BlockEntityRenderer;")) @Redirect(method = "performBuild", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/blockentity/BlockEntityRenderDispatcher;getRenderer(Lnet/minecraft/world/level/block/entity/BlockEntity;)Lnet/minecraft/client/renderer/blockentity/BlockEntityRenderer;", remap = true))
private BlockEntityRenderer<?> flywheel$redirectGetRenderer(BlockEntityRenderDispatcher dispatcher, BlockEntity blockEntity) { private BlockEntityRenderer<?> flywheel$redirectGetRenderer(BlockEntityRenderDispatcher dispatcher, BlockEntity blockEntity) {
if (InstancedRenderDispatcher.tryAddBlockEntity(blockEntity)) { if (InstancedRenderDispatcher.tryAddBlockEntity(blockEntity)) {
return null; return null;

View file

@ -4,7 +4,7 @@
"package": "com.jozufozu.flywheel.mixin.sodium", "package": "com.jozufozu.flywheel.mixin.sodium",
"compatibilityLevel": "JAVA_17", "compatibilityLevel": "JAVA_17",
"refmap": "flywheel.refmap.json", "refmap": "flywheel.refmap.json",
"plugin": "com.jozufozu.flywheel.mixin.sodium.SodiumMixinConfigPlugin", "plugin": "com.jozufozu.flywheel.mixin.sodium.SodiumMixinPlugin",
"client": [ "client": [
"ChunkRenderRebuildTaskMixin" "ChunkRenderRebuildTaskMixin"
], ],