Fixed and surprisingly improved shoulder rendering.

Author: Waterpicker

common/src/main/java/generations/gg/generations/core/generationscore/common/client/model/RareCandyBone.kt

@@ -95,7 +95,6 @@ class RareCandyBone /*Remove when cobblemon doesn't have parts of code that assu
             stack.pushPose()
             stack.mulPose(ROTATION_CORRECTION)
             stack.scale(-scale, -scale, scale)
-            stack.translate(0.0, -1.501 / scale, 0.0)
             instance.transformationMatrix().set(stack.last().pose())
             stack.popPose()
 

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

@@ -1,10 +1,4 @@
 package generations.gg.generations.core.generationscore.common.client.render.entity
 
-import com.cobblemon.mod.common.client.render.layer.PokemonOnShoulderRenderer
-import net.minecraft.nbt.CompoundTag
-import java.util.*
-
 interface PokemonOnShoulderRenderAccess {
-    fun invokeExtractUuid(tag: CompoundTag?): UUID?
-    fun invokeExtractData(shoulderNbt: CompoundTag?, pokemonUUID: UUID?): PokemonOnShoulderRenderer.ShoulderData?
 }

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

@@ -52,7 +52,7 @@ class StatueEntityRenderer(arg: EntityRendererProvider.Context) : EntityRenderer
         stack.pushPose()
         stack.scale(-1f, -1f, 1f)
         val scale: Float = entity.scale
-        stack.translate(0.0, -1.501 * scale, 0.0)
+//        stack.translate(0.0, -1.501 * scale, 0.0)
         stack.scale(scale, scale, scale)
         stack.mulPose(Axis.YP.rotationDegrees(entity.orientation))
 

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

@@ -25,27 +25,13 @@
 import java.util.UUID;
 
 @Mixin(PokemonOnShoulderRenderer.class)
-public abstract class PokemonOnShoulderRenderMixin<T extends Player> extends RenderLayer<T, PlayerModel<T>> implements PokemonOnShoulderRenderAccess {
-    public PokemonOnShoulderRenderMixin(RenderLayerParent<T, PlayerModel<T>> renderer) {
-        super(renderer);
-    }
-
-//    @Invoker(value = "extractUuid", remap = false) public abstract UUID invokeExtractUuid(CompoundTag tag);
-//
-//    @Invoker(value = "extractData", remap = false) public abstract PokemonOnShoulderRenderer.ShoulderData shoulderDataFrom(CompoundTag shoulderNbt, UUID pokemonUUID);
-
+public abstract class PokemonOnShoulderRenderMixin {
     @Redirect(method = "render(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/player/Player;FFFFFFZ)V", at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/vertex/PoseStack;translate(DDD)V"))
     public void renderTranslate(PoseStack instance, double x, double y, double z, @Local(argsOnly = true) boolean pLeftShoulder, @Local(name = "model") PosableModel model) {
         if(model.getRootPart() instanceof RareCandyBone) {
-            x += pLeftShoulder ? -0.175 : 0.175;
+            x += pLeftShoulder ? 0.175 : -0.175;
         }
 
         instance.translate(x, y, z);
     }
-
-//    @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) {
-//        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/PokemonOnShoulderRenderMixin.java

@@ -45,7 +45,7 @@ object GenerationsNetwork {
         list.add(PacketRegisterInfo(SpawnStatuePacket.ID, SpawnStatuePacket::decode, SpawnExtraDataEntityHandler()))
         list.add(PacketRegisterInfo(S2CPlaySoundPacket.ID, S2CPlaySoundPacket::decode, S2CPlaySoundHandler))
         // TODO: remove TeraTypeUpdatePacket when its registered in Cobblemon's own network
-        list.add(PacketRegisterInfo(TeraTypeUpdatePacket.ID, TeraTypeUpdatePacket::decode, PokemonUpdatePacketHandler()))
+//        list.add(PacketRegisterInfo(TeraTypeUpdatePacket.ID, TeraTypeUpdatePacket::decode, PokemonUpdatePacketHandler()))
 
         return list;
     }

common/src/main/java/generations/gg/generations/core/generationscore/common/network/GenerationsNetwork.kt

@@ -13,8 +13,8 @@ botarium_version=2.3.4
 devauth_version=1.2.1
 cobblemon_version=1.7.0+1.21.1
 
-fabric_loader_version=0.16.12
-fabric_api_version=0.115.4
+fabric_loader_version=0.17.2
+fabric_api_version=0.116.6
 
 neoforge_version=21.1.84