From bddf2beffb9ecc4e56985fb39c82951fef8c58ad Mon Sep 17 00:00:00 2001 From: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com> Date: Sun, 3 Nov 2024 10:35:52 -0500 Subject: [PATCH] refactor: fix incorrect parameter type and delete `CheckRenderEntityEvent` --- .../renderer/MixinRenderManager.java | 36 --------------- .../events/impl/CheckRenderEntityEvent.kt | 34 -------------- .../features/impl/crimson/KuudraFeatures.kt | 4 +- .../hooks/renderer/RenderManagerHook.kt | 46 ------------------- mod/src/main/resources/mixins.skytils.json | 1 - 5 files changed, 2 insertions(+), 119 deletions(-) delete mode 100644 mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinRenderManager.java delete mode 100644 mod/src/main/kotlin/gg/skytils/skytilsmod/events/impl/CheckRenderEntityEvent.kt delete mode 100644 mod/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/RenderManagerHook.kt diff --git a/mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinRenderManager.java b/mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinRenderManager.java deleted file mode 100644 index 75709aee4..000000000 --- a/mod/src/main/java/gg/skytils/skytilsmod/mixins/transformers/renderer/MixinRenderManager.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Skytils - Hypixel Skyblock Quality of Life Mod - * Copyright (C) 2020-2023 Skytils - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ - -package gg.skytils.skytilsmod.mixins.transformers.renderer; - -import gg.skytils.skytilsmod.mixins.hooks.renderer.RenderManagerHookKt; -import net.minecraft.client.renderer.culling.ICamera; -import net.minecraft.client.renderer.entity.RenderManager; -import net.minecraft.entity.Entity; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -@Mixin(RenderManager.class) -public abstract class MixinRenderManager { - @Inject(method = "shouldRender", at = @At("HEAD"), cancellable = true) - private void shouldRender(Entity entityIn, ICamera camera, double camX, double camY, double camZ, CallbackInfoReturnable cir) { - RenderManagerHookKt.shouldRender(entityIn, camera, camX, camY, camZ, cir); - } -} diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/events/impl/CheckRenderEntityEvent.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/events/impl/CheckRenderEntityEvent.kt deleted file mode 100644 index c3af839e4..000000000 --- a/mod/src/main/kotlin/gg/skytils/skytilsmod/events/impl/CheckRenderEntityEvent.kt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Skytils - Hypixel Skyblock Quality of Life Mod - * Copyright (C) 2020-2023 Skytils - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package gg.skytils.skytilsmod.events.impl - -import gg.skytils.skytilsmod.events.SkytilsEvent -import net.minecraft.client.renderer.culling.ICamera -import net.minecraft.entity.Entity -import net.minecraftforge.fml.common.eventhandler.Cancelable -import net.minecraftforge.fml.common.eventhandler.Event.HasResult - -@Cancelable -@HasResult -data class CheckRenderEntityEvent( - val entity: T, - val camera: ICamera, - val camX: Double, - val camY: Double, - val camZ: Double -) : SkytilsEvent() \ No newline at end of file diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/crimson/KuudraFeatures.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/crimson/KuudraFeatures.kt index a323c492a..21d9b7b5f 100644 --- a/mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/crimson/KuudraFeatures.kt +++ b/mod/src/main/kotlin/gg/skytils/skytilsmod/features/impl/crimson/KuudraFeatures.kt @@ -23,11 +23,11 @@ import gg.essential.universal.UKeyboard import gg.skytils.event.EventPriority import gg.skytils.event.EventSubscriber import gg.skytils.event.impl.play.WorldUnloadEvent +import gg.skytils.event.impl.render.CheckRenderEntityEvent import gg.skytils.event.register import gg.skytils.skytilsmod.Skytils import gg.skytils.skytilsmod._event.PacketReceiveEvent import gg.skytils.skytilsmod.core.tickTimer -import gg.skytils.skytilsmod.events.impl.CheckRenderEntityEvent import gg.skytils.skytilsmod.utils.* import net.minecraft.entity.item.EntityArmorStand import net.minecraft.network.play.server.S02PacketChat @@ -62,7 +62,7 @@ object KuudraFeatures : EventSubscriber { if (event.entity !is EntityArmorStand || SBInfo.mode != SkyblockIsland.KuudraHollow.mode) return if (Skytils.config.kuudraHideNonNametags && !kuudraOver && !UKeyboard.isKeyDown(UKeyboard.KEY_LMENU)) { if (event.entity.isInvisible && !event.entity.alwaysRenderNameTag) { - event.isCanceled = true + event.cancelled = true } } } diff --git a/mod/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/RenderManagerHook.kt b/mod/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/RenderManagerHook.kt deleted file mode 100644 index d55857915..000000000 --- a/mod/src/main/kotlin/gg/skytils/skytilsmod/mixins/hooks/renderer/RenderManagerHook.kt +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Skytils - Hypixel Skyblock Quality of Life Mod - * Copyright (C) 2020-2023 Skytils - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package gg.skytils.skytilsmod.mixins.hooks.renderer - -import gg.skytils.skytilsmod.events.impl.CheckRenderEntityEvent -import net.minecraft.client.renderer.culling.ICamera -import net.minecraft.entity.Entity -import net.minecraftforge.fml.common.eventhandler.Event -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable - -fun shouldRender( - entityIn: Entity, - camera: ICamera, - camX: Double, - camY: Double, - camZ: Double, - cir: CallbackInfoReturnable -) { - val event = CheckRenderEntityEvent( - entityIn, - camera, - camX, - camY, - camZ - ) - when { - event.postAndCatch() -> cir.returnValue = false - event.result == Event.Result.DENY -> cir.returnValue = false - event.result == Event.Result.ALLOW -> cir.returnValue = true - } -} \ No newline at end of file diff --git a/mod/src/main/resources/mixins.skytils.json b/mod/src/main/resources/mixins.skytils.json index 0fe755d12..9f327fc4e 100644 --- a/mod/src/main/resources/mixins.skytils.json +++ b/mod/src/main/resources/mixins.skytils.json @@ -80,7 +80,6 @@ "renderer.MixinRendererLivingEntity", "renderer.MixinRenderItem", "renderer.MixinRenderLightningBolt", - "renderer.MixinRenderManager", "renderer.MixinTileEntityChestRenderer", "renderer.MixinTileEntityItemStackRenderer", "renderer.MixinTileEntitySkullRenderer",