A few tweaks of shoulder stuff.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/client/render/entity/GenerationsPokemonOnShoulderProxy.kt

@@ -39,7 +39,7 @@ object GenerationsPokemonOnShoulderProxy {
         netHeadYaw: Float,
         headPitch: Float,
         pLeftShoulder: Boolean,
-    ): Boolean {
+    ) {
         val compoundTag = if (pLeftShoulder) livingEntity.shoulderEntityLeft else livingEntity.shoulderEntityRight
         if (compoundTag.isPokemonEntity()) {
             matrixStack.pushPose()
@@ -58,7 +58,7 @@ object GenerationsPokemonOnShoulderProxy {
 
             if (shoulderData == null){
                 // Could be null
-                shoulderData = (if (pLeftShoulder) cache.lastKnownLeft else cache.lastKnownRight) ?: return false
+                shoulderData = (if (pLeftShoulder) cache.lastKnownLeft else cache.lastKnownRight) ?: return
             }
 
             val model = PokemonModelRepository.getPoser(shoulderData.species.resourceIdentifier, shoulderData.aspects)
@@ -123,9 +123,7 @@ object GenerationsPokemonOnShoulderProxy {
             }
             model.setDefault()
             matrixStack.popPose()
-            return true
         }
-        return false
     }
 
     private data class ShoulderCache(

common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/client/PokemonOnShoulderRenderMixin.java

@@ -34,8 +34,7 @@ public PokemonOnShoulderRenderMixin(RenderLayerParent<T, PlayerModel<T>> rendere
 
     @Inject(method = "render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/player/Player;FFFFFFZ)V", at = @At("HEAD"), cancellable = true)
     public void render(PoseStack matrixStack, MultiBufferSource buffer, int packedLight, T livingEntity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, boolean pLeftShoulder, CallbackInfo ci) {
-        if(GenerationsPokemonOnShoulderProxy.render(this, matrixStack, buffer, packedLight, livingEntity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, pLeftShoulder)) {
-            ci.cancel();
-        }
+        GenerationsPokemonOnShoulderProxy.render(this, matrixStack, buffer, packedLight, livingEntity, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, pLeftShoulder);
+        ci.cancel();
     }
 }

common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/client/PokemonOnShoulderRendererCompanionAccessorMixin.java

@@ -20,7 +20,7 @@
 public class PokemonOnShoulderRendererCompanionAccessorMixin {
 
     @Inject(method = "shoulderDataOf", at = @At("HEAD"), cancellable = true)
-    public void blep(Player player, CallbackInfoReturnable<Tuple<PokemonOnShoulderRenderer.ShoulderData, PokemonOnShoulderRenderer.ShoulderData>> cir) {
+    public void of(Player player, CallbackInfoReturnable<Tuple<PokemonOnShoulderRenderer.ShoulderData, PokemonOnShoulderRenderer.ShoulderData>> cir) {
         cir.setReturnValue(GenerationsPokemonOnShoulderProxy.shoulderDataOf(player));
     }
 }