diff --git a/src/main/java/net/silentclient/client/mixin/mixins/BlockModelRendererAmbientOcclusionFaceMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/BlockModelRendererAmbientOcclusionFaceMixin.java index 0da349f..58b74b1 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/BlockModelRendererAmbientOcclusionFaceMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/BlockModelRendererAmbientOcclusionFaceMixin.java @@ -23,7 +23,7 @@ public class BlockModelRendererAmbientOcclusionFaceMixin { //#endif ) ) - private boolean patcher$betterSmoothLighting(Block block) { + private boolean silent$betterSmoothLighting(Block block) { //#if MC==10809 return !block.isVisuallyOpaque() || block.getLightOpacity() == 0; //#else diff --git a/src/main/java/net/silentclient/client/mixin/mixins/C17PacketCustomPayloadMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/C17PacketCustomPayloadMixin.java index 0873dc9..5477f09 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/C17PacketCustomPayloadMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/C17PacketCustomPayloadMixin.java @@ -16,7 +16,7 @@ public class C17PacketCustomPayloadMixin { private PacketBuffer data; @Inject(method = "processPacket(Lnet/minecraft/network/play/INetHandlerPlayServer;)V", at = @At("TAIL")) - private void patcher$releaseData(INetHandlerPlayServer handler, CallbackInfo ci) { + private void silent$releaseData(INetHandlerPlayServer handler, CallbackInfo ci) { if (this.data != null) { this.data.release(); } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/EffectRendererMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/EffectRendererMixin.java index 4637b70..6c3f9d3 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/EffectRendererMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/EffectRendererMixin.java @@ -23,7 +23,7 @@ public class EffectRendererMixin { target = "Lnet/minecraft/client/particle/EntityFX;renderParticle(Lnet/minecraft/client/renderer/WorldRenderer;Lnet/minecraft/entity/Entity;FFFFFF)V" ) ) - private void patcher$cullParticles( + private void silent$cullParticles( EntityFX instance, WorldRenderer worldRendererIn, Entity entityIn, float partialTicks, float rotationX, float rotationZ, float rotationYZ, float rotationXY, float rotationXZ ) { @@ -36,7 +36,7 @@ public class EffectRendererMixin { method = "updateEffectAlphaLayer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/particle/EffectRenderer;tickParticle(Lnet/minecraft/client/particle/EntityFX;)V", shift = At.Shift.AFTER) ) - private EntityFX patcher$checkIfCulled(EntityFX entityFX) { + private EntityFX silent$checkIfCulled(EntityFX entityFX) { if (ParticleCulling.camera != null) { ((EntityFXExt) entityFX).setCullState(ParticleCulling.camera.isBoundingBoxInFrustum( //#if MC==10809 diff --git a/src/main/java/net/silentclient/client/mixin/mixins/EntityLivingBaseMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/EntityLivingBaseMixin.java index b9da4ec..feb20f6 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/EntityLivingBaseMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/EntityLivingBaseMixin.java @@ -18,7 +18,7 @@ import java.util.Iterator; public class EntityLivingBaseMixin { @Inject(method = "updatePotionEffects", at = @At(value = "INVOKE", target = "Lnet/minecraft/potion/PotionEffect;onUpdate(Lnet/minecraft/entity/EntityLivingBase;)Z"), locals = LocalCapture.CAPTURE_FAILSOFT, cancellable = true) - private void patcher$checkPotionEffect(CallbackInfo ci, + private void silent$checkPotionEffect(CallbackInfo ci, //#if MC==10809 Iterator iterator, Integer integer, //#else diff --git a/src/main/java/net/silentclient/client/mixin/mixins/EntityPacketsMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/EntityPacketsMixin.java index fa14c80..4d34372 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/EntityPacketsMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/EntityPacketsMixin.java @@ -19,7 +19,7 @@ public class EntityPacketsMixin { cancellable = true, remap = false ) - private void patcher$addNullCheck(World worldIn, CallbackInfoReturnable cir) { + private void silent$addNullCheck(World worldIn, CallbackInfoReturnable cir) { if (worldIn == null) { cir.setReturnValue(null); } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/EntityXPOrbMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/EntityXPOrbMixin.java index 8f8da07..01d5767 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/EntityXPOrbMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/EntityXPOrbMixin.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; public class EntityXPOrbMixin { //#if MC==10809 @Redirect(method = "onUpdate", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/player/EntityPlayer;getEyeHeight()F")) - private float patcher$lowerHeight(EntityPlayer entityPlayer) { + private float silent$lowerHeight(EntityPlayer entityPlayer) { return (float) (entityPlayer.getEyeHeight() / 2.0D); } //#endif diff --git a/src/main/java/net/silentclient/client/mixin/mixins/GuiGameOverMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/GuiGameOverMixin.java index 38cde7a..6e5dfee 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/GuiGameOverMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/GuiGameOverMixin.java @@ -13,7 +13,7 @@ public class GuiGameOverMixin { @Shadow private int enableButtonsTimer; @Inject(method = "initGui", at = @At("HEAD")) - private void patcher$allowClickable(CallbackInfo ci) { + private void silent$allowClickable(CallbackInfo ci) { this.enableButtonsTimer = 0; } //#endif diff --git a/src/main/java/net/silentclient/client/mixin/mixins/GuiScreenOptionsSoundsMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/GuiScreenOptionsSoundsMixin.java index 4b07abc..6cf477d 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/GuiScreenOptionsSoundsMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/GuiScreenOptionsSoundsMixin.java @@ -11,12 +11,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(targets = "net.minecraft.client.gui.GuiScreenOptionsSounds$Button") public class GuiScreenOptionsSoundsMixin { @Redirect(method = "mouseDragged(Lnet/minecraft/client/Minecraft;II)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/settings/GameSettings;saveOptions()V")) - private void patcher$cancelSaving(GameSettings instance) { + private void silent$cancelSaving(GameSettings instance) { // no-op } @Inject(method = "mouseReleased(II)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/audio/SoundHandler;playSound(Lnet/minecraft/client/audio/ISound;)V")) - private void patcher$save(int mouseX, int mouseY, CallbackInfo ci) { + private void silent$save(int mouseX, int mouseY, CallbackInfo ci) { Minecraft.getMinecraft().gameSettings.saveOptions(); } } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/GuiScreenResourcePacksMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/GuiScreenResourcePacksMixin.java index 8fcb955..50140b7 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/GuiScreenResourcePacksMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/GuiScreenResourcePacksMixin.java @@ -12,7 +12,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(GuiScreenResourcePacks.class) public class GuiScreenResourcePacksMixin { @Inject(method = "actionPerformed", at = @At(value = "INVOKE", target = "Ljava/util/Collections;reverse(Ljava/util/List;)V", remap = false)) - private void patcher$clearHandles(CallbackInfo ci) { + private void silent$clearHandles(CallbackInfo ci) { ResourcePackRepository repository = Minecraft.getMinecraft().getResourcePackRepository(); for (ResourcePackRepository.Entry entry : repository.getRepositoryEntries()) { IResourcePack current = repository.getResourcePackInstance(); diff --git a/src/main/java/net/silentclient/client/mixin/mixins/LayerWitherAuraMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/LayerWitherAuraMixin.java index 79366d2..633f10a 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/LayerWitherAuraMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/LayerWitherAuraMixin.java @@ -10,7 +10,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(LayerWitherAura.class) public class LayerWitherAuraMixin { @Inject(method = "doRenderLayer(Lnet/minecraft/entity/boss/EntityWither;FFFFFFF)V", at = @At("TAIL")) - private void patcher$fixDepth(CallbackInfo ci) { + private void silent$fixDepth(CallbackInfo ci) { GlStateManager.depthMask(true); } } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/MinecraftServerMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/MinecraftServerMixin.java index 68c3f09..f90ed1b 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/MinecraftServerMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/MinecraftServerMixin.java @@ -13,7 +13,7 @@ public class MinecraftServerMixin { at = @At(value = "INVOKE", target = "Lnet/minecraft/network/ServerStatusResponse;setFavicon(Ljava/lang/String;)V", shift = At.Shift.AFTER), ordinal = 1 ) - private ByteBuf patcher$releaseByteBuf(ByteBuf buf1) { + private ByteBuf silent$releaseByteBuf(ByteBuf buf1) { buf1.release(); return buf1; } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/NetHandlerPlayClientMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/NetHandlerPlayClientMixin.java index 4abc27b..45f5d69 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/NetHandlerPlayClientMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/NetHandlerPlayClientMixin.java @@ -36,7 +36,7 @@ public class NetHandlerPlayClientMixin { //#if MC==10809 @Inject(method = "handleResourcePack", at = @At("HEAD"), cancellable = true) - private void patcher$resourceExploitFix(S48PacketResourcePackSend packetIn, CallbackInfo ci) { + private void silent$resourceExploitFix(S48PacketResourcePackSend packetIn, CallbackInfo ci) { if (!NetHandlerPlayClientHook.validateResourcePackUrl((NetHandlerPlayClient) (Object) this, packetIn)) { ci.cancel(); } @@ -46,7 +46,7 @@ public class NetHandlerPlayClientMixin { slice = @Slice(from = @At(value = "CONSTANT", args = "stringValue=Unable to locate sign at ", ordinal = 0)), at = @At(value = "INVOKE", target = "Lnet/minecraft/client/entity/EntityPlayerSP;addChatMessage(Lnet/minecraft/util/IChatComponent;)V", ordinal = 0) ) - private void patcher$removeDebugMessage(EntityPlayerSP instance, IChatComponent component) { + private void silent$removeDebugMessage(EntityPlayerSP instance, IChatComponent component) { // No-op } //#endif diff --git a/src/main/java/net/silentclient/client/mixin/mixins/NodeProcessorMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/NodeProcessorMixin.java index 924f2c6..52f74ef 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/NodeProcessorMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/NodeProcessorMixin.java @@ -14,7 +14,7 @@ public class NodeProcessorMixin { @Shadow protected IBlockAccess blockaccess; @Inject(method = "postProcess", at = @At("HEAD")) - private void patcher$cleanupBlockAccess(CallbackInfo ci) { + private void silent$cleanupBlockAccess(CallbackInfo ci) { this.blockaccess = null; } //#endif diff --git a/src/main/java/net/silentclient/client/mixin/mixins/PacketThreadUtilMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/PacketThreadUtilMixin.java index 896d002..5d4484a 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/PacketThreadUtilMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/PacketThreadUtilMixin.java @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.Redirect; public class PacketThreadUtilMixin { @SuppressWarnings({"rawtypes", "unchecked"}) @Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/network/Packet;processPacket(Lnet/minecraft/network/INetHandler;)V")) - private void patcher$ignorePacketsFromClosedConnections(Packet packet, INetHandler handler) { + private void silent$ignorePacketsFromClosedConnections(Packet packet, INetHandler handler) { if (handler instanceof NetHandlerPlayClient) { if (((NetHandlerPlayClient) handler).getNetworkManager().isChannelOpen()) { packet.processPacket(handler); diff --git a/src/main/java/net/silentclient/client/mixin/mixins/RenderGlobalMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/RenderGlobalMixin.java index 8435c0b..617c359 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/RenderGlobalMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/RenderGlobalMixin.java @@ -34,7 +34,7 @@ public class RenderGlobalMixin { } @ModifyVariable(method = "getVisibleFacings", name = "visgraph", at = @At(value = "STORE", ordinal = 0)) - private VisGraph patcher$setLimitScan(VisGraph visgraph) { + private VisGraph silent$setLimitScan(VisGraph visgraph) { ((VisGraphExt) visgraph).silent$setLimitScan(true); return visgraph; } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/RenderItemFrameMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/RenderItemFrameMixin.java index b083755..b7d9487 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/RenderItemFrameMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/RenderItemFrameMixin.java @@ -16,7 +16,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(RenderItemFrame.class) public class RenderItemFrameMixin { @Inject(method = "doRender(Lnet/minecraft/entity/item/EntityItemFrame;DDDFF)V", at = @At("HEAD"), cancellable = true) - private void patcher$cancelRender(EntityItemFrame entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { + private void silent$cancelRender(EntityItemFrame entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) { if (Client.getInstance().getSettingsManager().getSettingByClass(FPSBoostMod.class, "Hide Item Frames").getValBoolean()) { ci.cancel(); return; diff --git a/src/main/java/net/silentclient/client/mixin/mixins/S3FPacketCustomPayloadMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/S3FPacketCustomPayloadMixin.java index ce99bb0..e21b4cc 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/S3FPacketCustomPayloadMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/S3FPacketCustomPayloadMixin.java @@ -15,7 +15,7 @@ public class S3FPacketCustomPayloadMixin { @Shadow private PacketBuffer data; @Inject(method = "processPacket(Lnet/minecraft/network/play/INetHandlerPlayClient;)V", at = @At("TAIL")) - private void patcher$releaseData(INetHandlerPlayClient handler, CallbackInfo ci) { + private void silent$releaseData(INetHandlerPlayClient handler, CallbackInfo ci) { if (this.data != null) { this.data.release(); } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/ScoreboardMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/ScoreboardMixin.java index cb71d20..2d003dc 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/ScoreboardMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/ScoreboardMixin.java @@ -18,34 +18,34 @@ public abstract class ScoreboardMixin { @Shadow public abstract ScorePlayerTeam getTeam(String p_96508_1_); @Inject(method = "removeTeam", at = @At("HEAD"), cancellable = true) - private void patcher$checkIfTeamIsNull(ScorePlayerTeam team, CallbackInfo ci) { + private void silent$checkIfTeamIsNull(ScorePlayerTeam team, CallbackInfo ci) { if (team == null) ci.cancel(); } @Redirect(method = "removeTeam", at = @At(value = "INVOKE", target = "Ljava/util/Map;remove(Ljava/lang/Object;)Ljava/lang/Object;", ordinal = 0, remap = false)) - private V patcher$checkIfRegisteredNameIsNull(Map instance, K o) { + private V silent$checkIfRegisteredNameIsNull(Map instance, K o) { if (o != null) return instance.remove(o); return null; } @Inject(method = "removeObjective", at = @At("HEAD"), cancellable = true) - private void patcher$checkIfObjectiveIsNull(ScoreObjective objective, CallbackInfo ci) { + private void silent$checkIfObjectiveIsNull(ScoreObjective objective, CallbackInfo ci) { if (objective == null) ci.cancel(); } @Redirect(method = "removeObjective", at = @At(value = "INVOKE", target = "Ljava/util/Map;remove(Ljava/lang/Object;)Ljava/lang/Object;", ordinal = 0, remap = false)) - private V patcher$checkIfNameIsNull(Map instance, K o) { + private V silent$checkIfNameIsNull(Map instance, K o) { if (o != null) return instance.remove(o); return null; } @Inject(method = "createTeam", at = @At(value = "CONSTANT", args = "stringValue=A team with the name '"), cancellable = true) - private void patcher$returnExistingTeam(String name, CallbackInfoReturnable cir) { + private void silent$returnExistingTeam(String name, CallbackInfoReturnable cir) { cir.setReturnValue(this.getTeam(name)); } @Inject(method = "removePlayerFromTeam", at = @At(value = "CONSTANT", args = "stringValue=Player is either on another team or not on any team. Cannot remove from team '"), cancellable = true) - private void patcher$silenceException(CallbackInfo ci) { + private void silent$silenceException(CallbackInfo ci) { ci.cancel(); } } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/SoundManagerMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/SoundManagerMixin.java index ebe7095..57b6370 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/SoundManagerMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/SoundManagerMixin.java @@ -53,7 +53,7 @@ public abstract class SoundManagerMixin { slice = @Slice(from = @At(value = "CONSTANT", args = "stringValue=Unable to play unknown soundEvent: {}", ordinal = 0)), at = @At(value = "INVOKE", target = "Lorg/apache/logging/log4j/Logger;warn(Lorg/apache/logging/log4j/Marker;Ljava/lang/String;[Ljava/lang/Object;)V", ordinal = 0, remap = false) ) - private void patcher$silenceWarning(Logger instance, Marker marker, String s, Object[] objects) { + private void silent$silenceWarning(Logger instance, Marker marker, String s, Object[] objects) { // No-op } } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/TileEntitySkullRendererMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/TileEntitySkullRendererMixin.java index 66c62ce..63272ca 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/TileEntitySkullRendererMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/TileEntitySkullRendererMixin.java @@ -22,7 +22,7 @@ public class TileEntitySkullRendererMixin { //#if MC==10809 @Inject(method = "renderSkull", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/ModelBase;render(Lnet/minecraft/entity/Entity;FFFFFF)V")) - private void patcher$enableBlending(CallbackInfo ci) { + private void silent$enableBlending(CallbackInfo ci) { GlStateManager.enableBlend(); GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, GL11.GL_ONE, GL11.GL_ZERO); } diff --git a/src/main/java/net/silentclient/client/mixin/mixins/VertexBufferMixin.java b/src/main/java/net/silentclient/client/mixin/mixins/VertexBufferMixin.java index e8ac4cc..c0717c0 100644 --- a/src/main/java/net/silentclient/client/mixin/mixins/VertexBufferMixin.java +++ b/src/main/java/net/silentclient/client/mixin/mixins/VertexBufferMixin.java @@ -16,7 +16,7 @@ public class VertexBufferMixin { // inject at INVOKE rather than HEAD as OptiFine changes this method for its Render Regions option @Inject(method = "bufferData", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/vertex/VertexBuffer;bindBuffer()V"), cancellable = true) - private void patcher$ignoreRemovedBuffers(ByteBuffer byteBuffer, CallbackInfo ci) { + private void silent$ignoreRemovedBuffers(ByteBuffer byteBuffer, CallbackInfo ci) { if (this.glBufferId == -1) { ci.cancel(); }