Rename CallbackInfoReturnable parameter names to cir

Also made TeamColorEvent receive the initial color of the entity

Author: ZeroMemes

src/main/java/clientapi/event/defaults/game/render/TeamColorEvent.java

@@ -41,10 +41,11 @@ public final class TeamColorEvent extends Cancellable {
     /**
      * The color of the entity.
      */
-    private int color = 0xFFFFFFFF;
+    private int color;
 
-    public TeamColorEvent(Entity entity) {
+    public TeamColorEvent(Entity entity, int color) {
         this.entity = entity;
+        this.color = color;
     }
 
     /**

src/main/java/clientapi/load/mixin/MixinBlock.java

@@ -46,11 +46,11 @@ public abstract class MixinBlock {
     private BoundingBoxEvent bbEvent;
 
     @Inject(method = "canCollideCheck", at = @At("HEAD"), cancellable = true)
-    private void canCollideCheck(IBlockState state, boolean hitIfLiquid, CallbackInfoReturnable<Boolean> ci) {
+    private void canCollideCheck(IBlockState state, boolean hitIfLiquid, CallbackInfoReturnable<Boolean> cir) {
         BlockCollisionEvent event = new BlockCollisionEvent((Block) (Object) this);
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
-            ci.setReturnValue(false);
+            cir.setReturnValue(false);
     }
 
     @Inject(method = "addCollisionBoxToList(Lnet/minecraft/block/state/IBlockState;Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/AxisAlignedBB;Ljava/util/List;Lnet/minecraft/entity/Entity;Z)V",

src/main/java/clientapi/load/mixin/MixinEntityRenderer.java

@@ -44,9 +44,9 @@
 public class MixinEntityRenderer {
 
     @Inject(method = "getFOVModifier", at = @At("HEAD"), cancellable = true)
-    private void getFOVModifier(float partialTicks, boolean useFOVSetting, CallbackInfoReturnable<Float> ci) {
+    private void getFOVModifier(float partialTicks, boolean useFOVSetting, CallbackInfoReturnable<Float> cir) {
         if (Camera.isCapturing())
-            ci.setReturnValue(90.0F);
+            cir.setReturnValue(90.0F);
     }
 
     @Inject(method = "updateCameraAndRender", at = @At(value = "INVOKE_STRING", target = "net/minecraft/profiler/Profiler.endStartSection(Ljava/lang/String;)V", args = { "ldc=gui" }))

src/main/java/clientapi/load/mixin/MixinRender.java

@@ -21,11 +21,13 @@
 import clientapi.event.defaults.game.render.TeamColorEvent;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.entity.Entity;
+import net.minecraft.scoreboard.ScorePlayerTeam;
 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;
+import org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 /**
  * @author Brady
@@ -34,12 +36,12 @@
 @Mixin(Render.class)
 public class MixinRender {
 
-    @Inject(method = "getTeamColor", at = @At("HEAD"), cancellable = true)
-    private void getTeamColor(Entity entityIn, CallbackInfoReturnable<Integer> ci) {
-        TeamColorEvent event = new TeamColorEvent(entityIn);
+    @Inject(method = "getTeamColor", at = @At("RETURN"), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD)
+    private void getTeamColor(Entity entityIn, CallbackInfoReturnable<Integer> cir, int i, ScorePlayerTeam scoreplayerteam) {
+        TeamColorEvent event = new TeamColorEvent(entityIn, i);
         ClientAPI.EVENT_BUS.post(event);
         if (event.isCancelled())
-            ci.setReturnValue(event.getColor());
+            cir.setReturnValue(event.getColor());
     }
 
     @Inject(method = "renderLivingLabel", at = @At("HEAD"), cancellable = true)