Better formatted Mixins

ZeroMemes · ZeroMemes · commit 12addaa03e66 · 2017-08-10T11:58:49.000-05:00
Changed access modifiers of Mixin methods to be less permissive.
diff --git a/src/main/java/me/zero/client/load/mixin/MixinBlock.java b/src/main/java/me/zero/client/load/mixin/MixinBlock.java
@@ -45,7 +45,7 @@ public abstract class MixinBlock {
     @Shadow protected static void addCollisionBoxToList(BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable AxisAlignedBB blockBox) {}
 
     @Inject(method = "canCollideCheck", at = @At("HEAD"), cancellable = true)
-    public void canCollideCheck(IBlockState state, boolean hitIfLiquid, CallbackInfoReturnable<Boolean> ci) {
+    private void canCollideCheck(IBlockState state, boolean hitIfLiquid, CallbackInfoReturnable<Boolean> ci) {
         BlockCollisionEvent event = new BlockCollisionEvent((Block) (Object) this);
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
diff --git a/src/main/java/me/zero/client/load/mixin/MixinEntity.java b/src/main/java/me/zero/client/load/mixin/MixinEntity.java
@@ -64,7 +64,7 @@ public abstract class MixinEntity implements IEntity {
     private Vec2 rotation, prevRotation;
 
     @Inject(method = "applyEntityCollision", at = @At("HEAD"), cancellable = true)
-    public void applyEntityCollision(Entity entityIn, CallbackInfo ci) {
+    private void applyEntityCollision(Entity entityIn, CallbackInfo ci) {
         EntityCollisionEvent event = new EntityCollisionEvent((Entity) (Object) this, entityIn);
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
diff --git a/src/main/java/me/zero/client/load/mixin/MixinEntityLivingBase.java b/src/main/java/me/zero/client/load/mixin/MixinEntityLivingBase.java
@@ -33,7 +33,7 @@
 public class MixinEntityLivingBase {
 
     @Inject(method = "onDeath", at = @At("HEAD"))
-    public void onDeath(DamageSource cause, CallbackInfo ci) {
+    private void onDeath(DamageSource cause, CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new EntityDeathEvent((EntityLivingBase) (Object) this, cause));
     }
 }
diff --git a/src/main/java/me/zero/client/load/mixin/MixinEntityPlayerSP.java b/src/main/java/me/zero/client/load/mixin/MixinEntityPlayerSP.java
@@ -62,22 +62,22 @@ public abstract class MixinEntityPlayerSP extends MixinEntity {
     @Shadow protected abstract boolean isCurrentViewEntity();
 
     @Inject(method = "onUpdate", at = @At("HEAD"))
-    public void onUpdate(CallbackInfo ci) {
+    private void onUpdate(CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new UpdateEvent());
     }
 
     @Inject(method = "onLivingUpdate", at = @At("HEAD"))
-    public void onLivingUpdatePre(CallbackInfo ci) {
+    private void onLivingUpdatePre(CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new LivingUpdateEvent(EventState.PRE));
     }
 
     @Inject(method = "onLivingUpdate", at = @At("RETURN"))
-    public void onLivingUpdatePost(CallbackInfo ci) {
+    private void onLivingUpdatePost(CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new LivingUpdateEvent(EventState.POST));
     }
 
     @Redirect(method = "move", at = @At(value = "INVOKE", target = "net/minecraft/client/entity/AbstractClientPlayer.move(Lnet/minecraft/entity/MoverType;DDD)V"))
-    public void move(AbstractClientPlayer player, MoverType type, double x, double y, double z) {
+    private void move(AbstractClientPlayer player, MoverType type, double x, double y, double z) {
         MoveEvent event = new MoveEvent(type, x, y, z);
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
diff --git a/src/main/java/me/zero/client/load/mixin/MixinEntityRenderer.java b/src/main/java/me/zero/client/load/mixin/MixinEntityRenderer.java
@@ -34,13 +34,13 @@
 public class MixinEntityRenderer {
 
     @Inject(method = "getFOVModifier", at = @At("HEAD"), cancellable = true)
-    public void getFOVModifier(float partialTicks, boolean useFOVSetting, CallbackInfoReturnable<Float> ci) {
+    private void getFOVModifier(float partialTicks, boolean useFOVSetting, CallbackInfoReturnable<Float> ci) {
         if (Camera.isCapturing())
             ci.setReturnValue(90.0F);
     }
 
     @Inject(method = "updateCameraAndRender", at = @At(value = "INVOKE", target = "net/minecraft/profiler/Profiler.endStartSection(Ljava/lang/String;)V"))
-    public void updateCameraAndRender(float partialTicks, long nanoTime, CallbackInfo ci) {
+    private void updateCameraAndRender(float partialTicks, long nanoTime, CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new RenderScreenEvent(partialTicks));
     }
 }
diff --git a/src/main/java/me/zero/client/load/mixin/MixinFontRenderer.java b/src/main/java/me/zero/client/load/mixin/MixinFontRenderer.java
@@ -31,14 +31,14 @@
 public abstract class MixinFontRenderer {
 
     @ModifyVariable(method = "renderStringAtPos", at = @At("HEAD"))
-    public String renderStringAtPos(String text) {
+    private String renderStringAtPos(String text) {
         TextEvent event = new TextEvent(text);
         ClientAPI.EVENT_BUS.post(event);
         return event.getText();
     }
 
     @ModifyVariable(method = "getStringWidth", at = @At("HEAD"))
-    public String getStringWidth(String text) {
+    private String getStringWidth(String text) {
         TextEvent event = new TextEvent(text);
         ClientAPI.EVENT_BUS.post(event);
         return event.getText();
diff --git a/src/main/java/me/zero/client/load/mixin/MixinGuiIngame.java b/src/main/java/me/zero/client/load/mixin/MixinGuiIngame.java
@@ -32,7 +32,7 @@
 public class MixinGuiIngame {
 
     @Inject(method = "renderGameOverlay", at = @At("RETURN"))
-    public void renderGameOverlay(float partialTicks, CallbackInfo ci) {
+    private void renderGameOverlay(float partialTicks, CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new RenderHudEvent(partialTicks));
     }
 }
diff --git a/src/main/java/me/zero/client/load/mixin/MixinItemRenderer.java b/src/main/java/me/zero/client/load/mixin/MixinItemRenderer.java
@@ -35,7 +35,7 @@
 public abstract class MixinItemRenderer {
 
     @Inject(method = "renderItemInFirstPerson(Lnet/minecraft/client/entity/AbstractClientPlayer;FFLnet/minecraft/util/EnumHand;FLnet/minecraft/item/ItemStack;F)V", at = @At("HEAD"), cancellable = true)
-    public void renderItemInFirstPerson(AbstractClientPlayer p_187457_1_, float p_187457_2_, float p_187457_3_, EnumHand p_187457_4_, float p_187457_5_, ItemStack p_187457_6_, float p_187457_7_, CallbackInfo ci) {
+    private void renderItemInFirstPerson(AbstractClientPlayer p_187457_1_, float p_187457_2_, float p_187457_3_, EnumHand p_187457_4_, float p_187457_5_, ItemStack p_187457_6_, float p_187457_7_, CallbackInfo ci) {
         ItemRenderEvent event = new ItemRenderEvent((ItemRenderer) (Object) this, p_187457_2_, p_187457_4_, p_187457_5_, p_187457_6_, p_187457_7_);
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
diff --git a/src/main/java/me/zero/client/load/mixin/MixinMinecraft.java b/src/main/java/me/zero/client/load/mixin/MixinMinecraft.java
@@ -77,17 +77,17 @@ public void clickMouse(ClickEvent.MouseButton button) {
     }
 
     @Inject(method = "runTick", at = @At("HEAD"))
-    public void onTick(CallbackInfo ci) {
+    private void onTick(CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new TickEvent());
     }
 
     @Inject(method = "runGameLoop", at = @At("HEAD"))
-    public void onLoop(CallbackInfo ci) {
+    private void onLoop(CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new LoopEvent());
     }
 
     @Inject(method = "runTickKeyboard", at = @At(value = "INVOKE_ASSIGN", target = "org/lwjgl/input/Keyboard.getEventKeyState()Z", remap = false))
-    public void onKeyEvent(CallbackInfo ci) {
+    private void onKeyEvent(CallbackInfo ci) {
         if (currentScreen != null)
             return;
 
@@ -98,7 +98,7 @@ public void onKeyEvent(CallbackInfo ci) {
     }
 
     @Inject(method = "init", at = @At("RETURN"))
-    public void init(CallbackInfo ci) {
+    private void init(CallbackInfo ci) {
         // Try and find the "client.json" config
         InputStream stream = this.getClass().getResourceAsStream("/client.json");
 
@@ -141,29 +141,29 @@ public void init(CallbackInfo ci) {
     }
 
     @Inject(method = "clickMouse", at = @At("HEAD"))
-    public void clickMouse(CallbackInfo ci) {
+    private void clickMouse(CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new ClickEvent(LEFT));
     }
 
     @Inject(method = "rightClickMouse", at = @At("HEAD"))
-    public void rightClickMouse(CallbackInfo ci) {
+    private void rightClickMouse(CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new ClickEvent(RIGHT));
     }
 
     @Inject(method = "middleClickMouse", at = @At("HEAD"))
-    public void middleClickMouse(CallbackInfo ci) {
+    private void middleClickMouse(CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new ClickEvent(MIDDLE));
     }
 
     @ModifyVariable(method = "displayGuiScreen", at = @At("HEAD"))
-    public GuiScreen displayGuiScreen(GuiScreen screen) {
+    private GuiScreen displayGuiScreen(GuiScreen screen) {
         GuiEvent event = new GuiEvent(screen);
         ClientAPI.EVENT_BUS.post(event);
         return event.getScreen();
     }
 
     @Inject(method = "loadWorld(Lnet/minecraft/client/multiplayer/WorldClient;Ljava/lang/String;)V", at = @At("HEAD"))
-    public void loadWorld(@Nullable WorldClient worldClientIn, String loadingMessage, CallbackInfo ci) {
+    private void loadWorld(@Nullable WorldClient worldClientIn, String loadingMessage, CallbackInfo ci) {
         // If the world is null, then it must be unloading
         if (worldClientIn != null)
             ClientAPI.EVENT_BUS.post(new WorldEvent.Load(worldClientIn));
@@ -172,7 +172,7 @@ public void loadWorld(@Nullable WorldClient worldClientIn, String loadingMessage
     }
 
     @Inject(method = "shutdown", at = @At("HEAD"), cancellable = true)
-    public void shutdown(CallbackInfo ci) {
+    private void shutdown(CallbackInfo ci) {
         GameShutdownEvent event = new GameShutdownEvent();
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
diff --git a/src/main/java/me/zero/client/load/mixin/MixinNetworkManager.java b/src/main/java/me/zero/client/load/mixin/MixinNetworkManager.java
@@ -36,11 +36,11 @@
 @Mixin(NetworkManager.class)
 public abstract class MixinNetworkManager {
 
-    @Shadow public abstract void dispatchPacket(final Packet<?> inPacket, @Nullable final GenericFutureListener<? extends Future<?super Void>>[] futureListeners);
+    @Shadow protected abstract void dispatchPacket(final Packet<?> inPacket, @Nullable final GenericFutureListener<? extends Future<? super Void>>[] futureListeners);
 
     @Redirect(method = "channelRead0", at = @At(value = "INVOKE", target = "net/minecraft/network/Packet.processPacket(Lnet/minecraft/network/INetHandler;)V"))
     @SuppressWarnings("unchecked")
-    public void processPacket(Packet<?> packetIn, INetHandler handler) {
+    private void processPacket(Packet<?> packetIn, INetHandler handler) {
         PacketEvent event = new PacketEvent.Receive(packetIn);
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
@@ -50,7 +50,7 @@ public void processPacket(Packet<?> packetIn, INetHandler handler) {
     }
 
     @Redirect(method = "sendPacket", at = @At(value = "INVOKE", target = "net/minecraft/network/NetworkManager.dispatchPacket(Lnet/minecraft/network/Packet;[Lio/netty/util/concurrent/GenericFutureListener;)V"))
-    public void sendPacket(NetworkManager networkManager, Packet<?> packetIn, @Nullable final GenericFutureListener<? extends Future<?super Void>>[] futureListeners) {
+    private void sendPacket(NetworkManager networkManager, Packet<?> packetIn, @Nullable final GenericFutureListener<? extends Future<?super Void>>[] futureListeners) {
         PacketEvent event = new PacketEvent.Send(packetIn);
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
diff --git a/src/main/java/me/zero/client/load/mixin/MixinProfiler.java b/src/main/java/me/zero/client/load/mixin/MixinProfiler.java
@@ -35,7 +35,7 @@ public class MixinProfiler {
     @Shadow private String profilingSection;
 
     @Inject(method = "startSection", at = @At("HEAD"))
-    public void startSection(String name, CallbackInfo ci) {
+    private void startSection(String name, CallbackInfo ci) {
         ClientAPI.EVENT_BUS.post(new ProfilerEvent(profilingSection, name));
     }
 }
diff --git a/src/main/java/me/zero/client/load/mixin/MixinRender.java b/src/main/java/me/zero/client/load/mixin/MixinRender.java
@@ -35,15 +35,15 @@
 public class MixinRender {
 
     @Inject(method = "getTeamColor", at = @At("HEAD"), cancellable = true)
-    public void getTeamColor(Entity entityIn, CallbackInfoReturnable<Integer> ci) {
+    private void getTeamColor(Entity entityIn, CallbackInfoReturnable<Integer> ci) {
         TeamColorEvent event = new TeamColorEvent(entityIn);
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
             ci.setReturnValue(event.getColor());
     }
 
     @Inject(method = "renderLivingLabel", at = @At("HEAD"), cancellable = true)
-    public void renderLivingLabel(Entity entityIn, String str, double x, double y, double z, int maxDistance, CallbackInfo ci) {
+    private void renderLivingLabel(Entity entityIn, String str, double x, double y, double z, int maxDistance, CallbackInfo ci) {
         RenderEntityLabelEvent event = new RenderEntityLabelEvent(entityIn, str);
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
diff --git a/src/main/java/me/zero/client/load/mixin/MixinRenderItem.java b/src/main/java/me/zero/client/load/mixin/MixinRenderItem.java
@@ -33,7 +33,7 @@
 public class MixinRenderItem {
 
     @Inject(method = "renderEffect", at = @At("HEAD"), cancellable = true)
-    public void renderEffect(IBakedModel model, CallbackInfo ci) {
+    private void renderEffect(IBakedModel model, CallbackInfo ci) {
         GlintEffectEvent event = new GlintEffectEvent(GlintEffectEvent.GlintTarget.ITEM);
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
diff --git a/src/main/java/me/zero/client/load/mixin/MixinRenderLivingBase.java b/src/main/java/me/zero/client/load/mixin/MixinRenderLivingBase.java
@@ -34,7 +34,7 @@ public class MixinRenderLivingBase {
 
     @Redirect(method = "renderLayers", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/entity/layers/LayerRenderer.doRenderLayer(Lnet/minecraft/entity/EntityLivingBase;FFFFFFF)V"))
     @SuppressWarnings("unchecked")
-    public void doRenderLayer(LayerRenderer renderer, EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scaleIn) {
+    private void doRenderLayer(LayerRenderer renderer, EntityLivingBase entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scaleIn) {
         LayerRenderEvent event = new LayerRenderEvent(entitylivingbaseIn, renderer);
         ClientAPI.EVENT_BUS.post(event);
         if (!event.isCancelled())
diff --git a/src/main/java/me/zero/client/load/mixin/MixinRenderManager.java b/src/main/java/me/zero/client/load/mixin/MixinRenderManager.java
@@ -35,7 +35,7 @@ public class MixinRenderManager {
 
     @Redirect(method = "doRenderEntity(Lnet/minecraft/entity/Entity;DDDFFZ)V", at = @At(value = "INVOKE", target = "net/minecraft/client/renderer/entity/Render.doRender(Lnet/minecraft/entity/Entity;DDDFF)V"))
     @SuppressWarnings("unchecked")
-    public void doRender(Render render, Entity entity, double x, double y, double z, float entityYaw, float partialTicks) {
+    private void doRender(Render render, Entity entity, double x, double y, double z, float entityYaw, float partialTicks) {
         EntityRenderEvent event = new EntityRenderEvent(EventState.PRE, render, entity, x, y, z, entityYaw, partialTicks);
         ClientAPI.EVENT_BUS.post(event);
         if (!event.isCancelled())

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`public class MixinEntityLivingBase {`
`34`	`34`
`35`	`35`	`@Inject(method = "onDeath", at = @At("HEAD"))`
`36`		`- public void onDeath(DamageSource cause, CallbackInfo ci) {`
	`36`	`+ private void onDeath(DamageSource cause, CallbackInfo ci) {`
`37`	`37`	`ClientAPI.EVENT_BUS.post(new EntityDeathEvent((EntityLivingBase) (Object) this, cause));`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,13 +34,13 @@`
`34`	`34`	`public class MixinEntityRenderer {`
`35`	`35`
`36`	`36`	`@Inject(method = "getFOVModifier", at = @At("HEAD"), cancellable = true)`
`37`		`- public void getFOVModifier(float partialTicks, boolean useFOVSetting, CallbackInfoReturnable<Float> ci) {`
	`37`	`+ private void getFOVModifier(float partialTicks, boolean useFOVSetting, CallbackInfoReturnable<Float> ci) {`
`38`	`38`	`if (Camera.isCapturing())`
`39`	`39`	`ci.setReturnValue(90.0F);`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`@Inject(method = "updateCameraAndRender", at = @At(value = "INVOKE", target = "net/minecraft/profiler/Profiler.endStartSection(Ljava/lang/String;)V"))`
`43`		`- public void updateCameraAndRender(float partialTicks, long nanoTime, CallbackInfo ci) {`
	`43`	`+ private void updateCameraAndRender(float partialTicks, long nanoTime, CallbackInfo ci) {`
`44`	`44`	`ClientAPI.EVENT_BUS.post(new RenderScreenEvent(partialTicks));`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@`
`32`	`32`	`public class MixinGuiIngame {`
`33`	`33`
`34`	`34`	`@Inject(method = "renderGameOverlay", at = @At("RETURN"))`
`35`		`- public void renderGameOverlay(float partialTicks, CallbackInfo ci) {`
	`35`	`+ private void renderGameOverlay(float partialTicks, CallbackInfo ci) {`
`36`	`36`	`ClientAPI.EVENT_BUS.post(new RenderHudEvent(partialTicks));`
`37`	`37`	`}`
`38`	`38`	`}`