From de8e8fa1b70ea98651b7ffe1b80beb73711125a4 Mon Sep 17 00:00:00 2001 From: Ridan Vandenbergh Date: Sat, 11 Aug 2018 00:23:26 +0200 Subject: [PATCH] xray thrown into the abyss fuck you --- .../event/events/RenderBlockModelEvent.java | 88 ------------------- .../event/events/RenderTileEntityEvent.java | 25 ------ .../kami/event/events/SetOpaqueCubeEvent.java | 25 ------ .../events/ShouldSideBeRenderedEvent.java | 34 ------- .../kami/event/events/UpdateEvent.java | 9 -- .../client/MixinForgeBlockModelRenderer.java | 36 -------- .../client/MixinStateImplementation.java | 8 -- .../MixinTileEntityRendererDispatcher.java | 26 ------ .../kami/mixin/client/MixinVisGraph.java | 25 ------ .../module/modules/render/Brightness.java | 22 +---- .../kami/module/modules/render/Xray.java | 40 --------- src/main/resources/mixins.kami.json | 3 +- 12 files changed, 4 insertions(+), 337 deletions(-) delete mode 100644 src/main/java/me/zeroeightsix/kami/event/events/RenderBlockModelEvent.java delete mode 100644 src/main/java/me/zeroeightsix/kami/event/events/RenderTileEntityEvent.java delete mode 100644 src/main/java/me/zeroeightsix/kami/event/events/SetOpaqueCubeEvent.java delete mode 100644 src/main/java/me/zeroeightsix/kami/event/events/ShouldSideBeRenderedEvent.java delete mode 100644 src/main/java/me/zeroeightsix/kami/event/events/UpdateEvent.java delete mode 100644 src/main/java/me/zeroeightsix/kami/mixin/client/MixinForgeBlockModelRenderer.java delete mode 100644 src/main/java/me/zeroeightsix/kami/mixin/client/MixinTileEntityRendererDispatcher.java delete mode 100644 src/main/java/me/zeroeightsix/kami/mixin/client/MixinVisGraph.java delete mode 100644 src/main/java/me/zeroeightsix/kami/module/modules/render/Xray.java diff --git a/src/main/java/me/zeroeightsix/kami/event/events/RenderBlockModelEvent.java b/src/main/java/me/zeroeightsix/kami/event/events/RenderBlockModelEvent.java deleted file mode 100644 index c845324e..00000000 --- a/src/main/java/me/zeroeightsix/kami/event/events/RenderBlockModelEvent.java +++ /dev/null @@ -1,88 +0,0 @@ -package me.zeroeightsix.kami.event.events; - -import me.zeroeightsix.kami.event.KamiEvent; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; - -/** - * @author 086 - */ -public class RenderBlockModelEvent extends KamiEvent { - - private IBlockAccess world; - private IBakedModel model; - private IBlockState state; - private BlockPos pos; - private BufferBuilder buffer; - private boolean checkSides; - private long rand; - - public RenderBlockModelEvent(IBlockAccess world, IBakedModel model, IBlockState state, BlockPos pos, BufferBuilder buffer, boolean checkSides, long rand) { - this.world = world; - this.model = model; - this.state = state; - this.pos = pos; - this.buffer = buffer; - this.checkSides = checkSides; - this.rand = rand; - } - - public IBlockAccess getWorld() { - return world; - } - - public void setWorld(IBlockAccess world) { - this.world = world; - } - - public IBakedModel getModel() { - return model; - } - - public void setModel(IBakedModel model) { - this.model = model; - } - - public IBlockState getState() { - return state; - } - - public void setState(IBlockState state) { - this.state = state; - } - - public BlockPos getPos() { - return pos; - } - - public void setPos(BlockPos pos) { - this.pos = pos; - } - - public BufferBuilder getBuffer() { - return buffer; - } - - public void setBuffer(BufferBuilder buffer) { - this.buffer = buffer; - } - - public boolean isCheckSides() { - return checkSides; - } - - public void setCheckSides(boolean checkSides) { - this.checkSides = checkSides; - } - - public long getRand() { - return rand; - } - - public void setRand(long rand) { - this.rand = rand; - } -} diff --git a/src/main/java/me/zeroeightsix/kami/event/events/RenderTileEntityEvent.java b/src/main/java/me/zeroeightsix/kami/event/events/RenderTileEntityEvent.java deleted file mode 100644 index 515f2442..00000000 --- a/src/main/java/me/zeroeightsix/kami/event/events/RenderTileEntityEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -package me.zeroeightsix.kami.event.events; - -import me.zeroeightsix.kami.event.KamiEvent; -import net.minecraft.block.Block; -import net.minecraft.tileentity.TileEntity; - -/** - * @author 086 - */ -public class RenderTileEntityEvent extends KamiEvent { - - TileEntity entity; - - public RenderTileEntityEvent(TileEntity entity) { - this.entity = entity; - } - - public TileEntity getEntity() { - return entity; - } - - public void setEntity(TileEntity entity) { - this.entity = entity; - } -} diff --git a/src/main/java/me/zeroeightsix/kami/event/events/SetOpaqueCubeEvent.java b/src/main/java/me/zeroeightsix/kami/event/events/SetOpaqueCubeEvent.java deleted file mode 100644 index ad3e213a..00000000 --- a/src/main/java/me/zeroeightsix/kami/event/events/SetOpaqueCubeEvent.java +++ /dev/null @@ -1,25 +0,0 @@ -package me.zeroeightsix.kami.event.events; - -import me.zeroeightsix.kami.event.KamiEvent; -import net.minecraft.util.math.BlockPos; - -/** - * @author 086 - */ -public class SetOpaqueCubeEvent extends KamiEvent { - - BlockPos pos; - - public SetOpaqueCubeEvent(BlockPos pos) { - this.pos = pos; - } - - public BlockPos getPos() { - return pos; - } - - public void setPos(BlockPos pos) { - this.pos = pos; - } - -} diff --git a/src/main/java/me/zeroeightsix/kami/event/events/ShouldSideBeRenderedEvent.java b/src/main/java/me/zeroeightsix/kami/event/events/ShouldSideBeRenderedEvent.java deleted file mode 100644 index ad00905c..00000000 --- a/src/main/java/me/zeroeightsix/kami/event/events/ShouldSideBeRenderedEvent.java +++ /dev/null @@ -1,34 +0,0 @@ -package me.zeroeightsix.kami.event.events; - -import net.minecraft.block.Block; - -/** - * @author 086 - */ -public class ShouldSideBeRenderedEvent { - - Block block; - boolean doRender; - - public ShouldSideBeRenderedEvent(Block block, boolean doRender) { - this.block = block; - this.doRender = doRender; - } - - public boolean isDoRender() { - return doRender; - } - - public void setDoRender(boolean doRender) { - this.doRender = doRender; - } - - public Block getBlock() { - return block; - } - - public void setBlock(Block block) { - this.block = block; - } - -} diff --git a/src/main/java/me/zeroeightsix/kami/event/events/UpdateEvent.java b/src/main/java/me/zeroeightsix/kami/event/events/UpdateEvent.java deleted file mode 100644 index 0d37028e..00000000 --- a/src/main/java/me/zeroeightsix/kami/event/events/UpdateEvent.java +++ /dev/null @@ -1,9 +0,0 @@ -package me.zeroeightsix.kami.event.events; - -import me.zeroeightsix.kami.event.KamiEvent; - -/** - * Created by 086 on 18/11/2017. - */ -public class UpdateEvent extends KamiEvent { -} diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinForgeBlockModelRenderer.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinForgeBlockModelRenderer.java deleted file mode 100644 index 3f4792f6..00000000 --- a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinForgeBlockModelRenderer.java +++ /dev/null @@ -1,36 +0,0 @@ -package me.zeroeightsix.kami.mixin.client; - -import me.zeroeightsix.kami.KamiMod; -import me.zeroeightsix.kami.event.events.RenderBlockModelEvent; -import net.minecraft.block.state.IBlockState; -import net.minecraft.client.renderer.BufferBuilder; -import net.minecraft.client.renderer.block.model.IBakedModel; -import net.minecraft.util.math.BlockPos; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.model.pipeline.ForgeBlockModelRenderer; -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; - -/** - * @author 086 - */ -@Mixin(ForgeBlockModelRenderer.class) -public class MixinForgeBlockModelRenderer { - - @Inject(method = "renderModelSmooth", at = @At("HEAD"), cancellable = true) - public void renderModelSmooth(IBlockAccess world, IBakedModel model, IBlockState state, BlockPos pos, BufferBuilder buffer, boolean checkSides, long rand, CallbackInfoReturnable info) { - RenderBlockModelEvent event = new RenderBlockModelEvent(world, model, state, pos, buffer, checkSides, rand); - KamiMod.EVENT_BUS.post(event); - if (event.isCancelled()) info.setReturnValue(true); - } - - @Inject(method = "renderModelFlat", at = @At("HEAD"), cancellable = true) - public void renderModelFlat(IBlockAccess world, IBakedModel model, IBlockState state, BlockPos pos, BufferBuilder buffer, boolean checkSides, long rand, CallbackInfoReturnable info) { - RenderBlockModelEvent event = new RenderBlockModelEvent(world, model, state, pos, buffer, checkSides, rand); - KamiMod.EVENT_BUS.post(event); - if (event.isCancelled()) info.setReturnValue(true); - } - -} diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinStateImplementation.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinStateImplementation.java index d6720dad..22fda1f6 100644 --- a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinStateImplementation.java +++ b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinStateImplementation.java @@ -2,7 +2,6 @@ package me.zeroeightsix.kami.mixin.client; import me.zeroeightsix.kami.KamiMod; import me.zeroeightsix.kami.event.events.AddCollisionBoxToListEvent; -import me.zeroeightsix.kami.event.events.ShouldSideBeRenderedEvent; import net.minecraft.block.Block; import net.minecraft.block.state.BlockStateContainer; import net.minecraft.block.state.IBlockState; @@ -38,11 +37,4 @@ public class MixinStateImplementation { block.addCollisionBoxToList(state, worldIn, pos, entityBox, collidingBoxes, entityIn, isActualState); } - @Redirect(method = "shouldSideBeRendered", at = @At(value = "INVOKE", target = "Lnet/minecraft/block/Block;shouldSideBeRendered(Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/world/IBlockAccess;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/EnumFacing;)Z")) - public boolean shouldSideBeRendered(Block block, IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) { - ShouldSideBeRenderedEvent event = new ShouldSideBeRenderedEvent(block, block.shouldSideBeRendered(blockState, blockAccess, pos, side)); - KamiMod.EVENT_BUS.post(event); - return event.isDoRender(); - } - } diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinTileEntityRendererDispatcher.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinTileEntityRendererDispatcher.java deleted file mode 100644 index 83f52bb3..00000000 --- a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinTileEntityRendererDispatcher.java +++ /dev/null @@ -1,26 +0,0 @@ -package me.zeroeightsix.kami.mixin.client; - -import me.zeroeightsix.kami.KamiMod; -import me.zeroeightsix.kami.event.events.RenderTileEntityEvent; -import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher; -import net.minecraft.tileentity.TileEntity; -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.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; - -/** - * @author 086 - */ -@Mixin(TileEntityRendererDispatcher.class) -public class MixinTileEntityRendererDispatcher { - - @Inject(method = "render(Lnet/minecraft/tileentity/TileEntity;DDDFIF)V", at = @At("HEAD"), cancellable = true) - public void render(TileEntity tileEntityIn, double x, double y, double z, float partialTicks, int destroyStage, float p_192854_10_, CallbackInfo info) { - RenderTileEntityEvent entityEvent = new RenderTileEntityEvent(tileEntityIn); - KamiMod.EVENT_BUS.post(entityEvent); - if (entityEvent.isCancelled()) info.cancel(); - } - -} diff --git a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinVisGraph.java b/src/main/java/me/zeroeightsix/kami/mixin/client/MixinVisGraph.java deleted file mode 100644 index 1d8d63fa..00000000 --- a/src/main/java/me/zeroeightsix/kami/mixin/client/MixinVisGraph.java +++ /dev/null @@ -1,25 +0,0 @@ -package me.zeroeightsix.kami.mixin.client; - -import me.zeroeightsix.kami.KamiMod; -import me.zeroeightsix.kami.event.events.SetOpaqueCubeEvent; -import net.minecraft.client.renderer.chunk.VisGraph; -import net.minecraft.util.math.BlockPos; -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.CallbackInfo; - -/** - * @author 086 - */ -@Mixin(VisGraph.class) -public class MixinVisGraph { - - @Inject(method = "setOpaqueCube", at = @At("HEAD"), cancellable = true) - public void setOpaqueCube(BlockPos pos, CallbackInfo info) { - SetOpaqueCubeEvent event = new SetOpaqueCubeEvent(pos); - KamiMod.EVENT_BUS.post(event); - if (event.isCancelled()) info.cancel(); - } - -} diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/Brightness.java b/src/main/java/me/zeroeightsix/kami/module/modules/render/Brightness.java index e901e909..1245a4e2 100644 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/Brightness.java +++ b/src/main/java/me/zeroeightsix/kami/module/modules/render/Brightness.java @@ -10,40 +10,24 @@ import me.zeroeightsix.kami.setting.Setting; public class Brightness extends Module { @Setting(name = "Brightness") - public float brightness = 8; + public float brightness = 16; @Setting(name = "prev_brightness", hidden = true) public float prevbrightness = 1; - boolean goingDown = false; @Override protected void onEnable() { - if (goingDown) { - mc.gameSettings.gammaSetting=prevbrightness; - alwaysListening = false; - goingDown = false; - } prevbrightness = mc.gameSettings.gammaSetting; } @Override public void onUpdate() { - if (goingDown) { - float dif = (prevbrightness-mc.gameSettings.gammaSetting); - mc.gameSettings.gammaSetting += dif*0.1f; - if (Math.abs(dif) <= .05f) { - mc.gameSettings.gammaSetting = prevbrightness; - setAlwaysListening(false); - goingDown = false; - } - }else - mc.gameSettings.gammaSetting += (brightness-mc.gameSettings.gammaSetting)*0.1f; + mc.gameSettings.gammaSetting = brightness; } @Override protected void onDisable() { - goingDown = true; - setAlwaysListening(true); + mc.gameSettings.gammaSetting = prevbrightness; } } diff --git a/src/main/java/me/zeroeightsix/kami/module/modules/render/Xray.java b/src/main/java/me/zeroeightsix/kami/module/modules/render/Xray.java deleted file mode 100644 index e8cb7e36..00000000 --- a/src/main/java/me/zeroeightsix/kami/module/modules/render/Xray.java +++ /dev/null @@ -1,40 +0,0 @@ -package me.zeroeightsix.kami.module.modules.render; - -import me.zero.alpine.listener.EventHandler; -import me.zero.alpine.listener.Listener; -import me.zero.alpine.type.Cancellable; -import me.zeroeightsix.kami.event.events.RenderBlockModelEvent; -import me.zeroeightsix.kami.event.events.SetOpaqueCubeEvent; -import me.zeroeightsix.kami.event.events.ShouldSideBeRenderedEvent; -import me.zeroeightsix.kami.module.Module; - -/** - * Created by 086 on 12/12/2017. - */ -@Module.Info(name = "Xray", description = "See blocks through walls", category = Module.Category.RENDER) -public class Xray extends Module { - - public static Xray INSTANCE; - - @Override - public void toggle() { - super.toggle(); - mc.renderGlobal.loadRenderers(); - } - - public Xray() { - Xray.INSTANCE = this; - } - - @EventHandler - public Listener eventListener = new Listener<>(Cancellable::cancel); - - @EventHandler - public Listener shouldSideBeRenderedEventListener = new Listener<>(event -> { - event.setDoRender(false); - }); - - @EventHandler - public Listener setOpaqueCubeEventListener = new Listener<>(Cancellable::cancel); - -} diff --git a/src/main/resources/mixins.kami.json b/src/main/resources/mixins.kami.json index 16d1a695..15177419 100644 --- a/src/main/resources/mixins.kami.json +++ b/src/main/resources/mixins.kami.json @@ -19,7 +19,6 @@ "MixinRenderPlayer", "MixinGuiPlayerTabOverlay", "MixinC00Handshake", - "MixinNetHandlerPlayClient", - "MixinForgeBlockModelRenderer" + "MixinNetHandlerPlayClient" ] }