Merge pull request #124 from Conno2429/1.7-port

Dysth · web-flow · commit 35d9b8085487 · 2026-02-08T11:58:01.000-05:00
Conno's 1.7.3 bump &amp; fixes
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/battle/GenerationsInstructionProcessor.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/battle/GenerationsInstructionProcessor.kt
@@ -54,7 +54,11 @@ object GenerationsInstructionProcessor {
         val name = s3[1]
 
         val ability = battlePokemon.originalPokemon.ability.name
-        battlePokemon.originalPokemon.persistentData.putString("original_ability", ability)
+
+        // Prevent terapagos original ability from becoming tera shell instead of tera shift
+        if (name != "stellar") {
+            battlePokemon.originalPokemon.persistentData.putString("original_ability", ability)
+        }
 
         if (effectedPokemon.form.name.equals("Dusk-Mane")) {
             battlePokemon.originalPokemon.persistentData.putString("necro_fusion", "dusk")
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/client/InteractWheelGuiFactoryProxy.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/client/InteractWheelGuiFactoryProxy.kt
@@ -28,50 +28,173 @@ import com.google.common.collect.Multimap
 import generations.gg.generations.core.generationscore.common.GenerationsCore
 import generations.gg.generations.core.generationscore.common.network.GenerationsNetwork
 import generations.gg.generations.core.generationscore.common.network.packets.GensInteractPokemonPacket
+import java.util.UUID
 import net.minecraft.client.Minecraft
 import net.minecraft.network.chat.Component
-import java.util.*
 import org.joml.Vector3f
 
 fun createPokemonInteractGui(
     pokemonID: UUID,
-    canMountShoulder: Boolean,
+    canMountShoulder:
+    Boolean,
     canGiveHeld: Boolean,
     canGiveCosmetic: Boolean,
     canRide: Boolean,
-    changeFormData: Pair<Boolean, String>): InteractWheelGUI {
-
+    changeFormData: Pair<Boolean, String>
+): InteractWheelGUI {
     val mountShoulder = InteractWheelOption(
-        iconResource = cobblemonResource("textures/gui/interact/icon_shoulder.png"),
+        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_shoulder.png"),
         tooltipText = "cobblemon.ui.interact.mount.shoulder",
+        enabled = canMountShoulder,
         onPress = {
             if (canMountShoulder) {
                 InteractPokemonPacket(pokemonID, InteractTypePokemon.SHOULDER).sendToServer()
                 closeGUI()
             }
         }
     )
-    val giveItem = InteractWheelOption(
-        iconResource = cobblemonResource("textures/gui/interact/icon_held_item.png"),
+    val giveHeldItem = InteractWheelOption(
+        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_held_item.png"),
         tooltipText = "cobblemon.ui.interact.give.item",
+        enabled = canGiveHeld,
         onPress = {
-            InteractPokemonPacket(pokemonID, InteractTypePokemon.HELD_ITEM).sendToServer()
-            closeGUI()
+            if (canGiveHeld) {
+                InteractPokemonPacket(pokemonID, InteractTypePokemon.HELD_ITEM).sendToServer()
+                closeGUI()
+            }
+        }
+    )
+    val giveCosmeticItem = InteractWheelOption(
+        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_cosmetic_item.png"),
+        tooltipText = "cobblemon.ui.interact.give.cosmetic_item",
+        enabled = canGiveCosmetic,
+        onPress = {
+            if (canGiveCosmetic) {
+                InteractPokemonPacket(pokemonID, InteractTypePokemon.COSMETIC_ITEM).sendToServer()
+                closeGUI()
+            }
+        }
+    )
+
+    val ride = InteractWheelOption(
+        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_ride.png"),
+        tooltipText = "cobblemon.ui.interact.ride",
+        enabled = canRide,
+        onPress = {
+            if (canRide) {
+                InteractPokemonPacket(pokemonID, InteractTypePokemon.RIDE).sendToServer()
+                closeGUI()
+            }
         }
     )
 
     val options: Multimap<Orientation, InteractWheelOption> = ArrayListMultimap.create()
-    options.put(Orientation.NORTHWEST, giveItem)
-    if (canMountShoulder) {
-        options.put(Orientation.NORTHEAST, mountShoulder)
-    }
+    options.put(Orientation.NORTH, giveHeldItem)
+    options.put(Orientation.NORTHEAST, giveCosmeticItem)
+    options.put(Orientation.WEST, ride)
+    options.put(Orientation.NORTHWEST, mountShoulder)
 
-    createOption(pokemonID, changeFormData)?.also { options.put(Orientation.SOUTHWEST, it) }
+    createOption(pokemonID, changeFormData)?.also { options.put(Orientation.EAST, it) }
 
-    CobblemonEvents.POKEMON_INTERACTION_GUI_CREATION.post(PokemonInteractionGUICreationEvent(pokemonID, canMountShoulder, true, false /* TOODO: is the items given cosmetic in thsi context? */, false /* TODO: I'm not even sure about this part. */, options))
+    CobblemonEvents.POKEMON_INTERACTION_GUI_CREATION.post(PokemonInteractionGUICreationEvent(
+        pokemonID = pokemonID,
+        mountShoulder = canMountShoulder,
+        giveHeld = canGiveHeld,
+        giveCosmetic = canGiveCosmetic,
+        canRide = canRide,
+        options = options
+    ))
     return InteractWheelGUI(options, Component.translatable("cobblemon.ui.interact.pokemon"))
 }
 
+fun createPlayerInteractGui(optionsPacket: PlayerInteractOptionsPacket): InteractWheelGUI {
+    val trade = InteractWheelOption(
+        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_trade.png"),
+        secondaryIconResource =  if (CobblemonClient.requests.tradeOffers[optionsPacket.targetId] != null)
+            cobblemonResource("textures/gui/interact/interact_wheel_icon_exclamation.png")
+        else null,
+        colour = { null },
+        tooltipText = "cobblemon.ui.interact.trade",
+        onPress = {
+            val tradeOffer = CobblemonClient.requests.tradeOffers[optionsPacket.targetId]
+            if (tradeOffer == null) {
+                CobblemonNetwork.sendToServer(OfferTradePacket(optionsPacket.targetId))
+            } else {
+                CobblemonClient.requests.tradeOffers.remove(optionsPacket.targetId)
+                CobblemonNetwork.sendToServer(AcceptTradeRequestPacket(tradeOffer.requestID))
+            }
+            closeGUI()
+        }
+    )
+    val activeBattleRequest = CobblemonClient.requests.battleChallenges[optionsPacket.targetId]
+    val activeTeamRequest = CobblemonClient.requests.multiBattleTeamRequests[optionsPacket.targetId]
+    val battle = InteractWheelOption(
+        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_battle.png"),
+        secondaryIconResource =  if(activeBattleRequest != null|| activeTeamRequest != null)
+            cobblemonResource("textures/gui/interact/interact_wheel_icon_exclamation.png")
+        else null,
+        colour = { null },
+        tooltipText = "cobblemon.ui.interact.battle",
+        onPress = {
+            Minecraft.getInstance().setScreen(BattleConfigureGUI(optionsPacket, activeBattleRequest, activeTeamRequest))
+        }
+    )
+
+    val spectate = InteractWheelOption(
+        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_spectate_battle.png"),
+        colour = { if (CobblemonClient.requests.battleChallenges[optionsPacket.targetId] != null) Vector3f(0F, 0.6F, 0F) else null },
+        onPress = {
+            SpectateBattlePacket(optionsPacket.targetId).sendToServer()
+            closeGUI()
+        },
+        tooltipText = "cobblemon.ui.interact.spectate"
+    )
+    val options: Multimap<Orientation, InteractWheelOption> = ArrayListMultimap.create()
+    // TODO: hasChallenge and hasTeamRequest get calculated a bunch of times. Might consider having the server just passing it over.
+    val hasChallenge = CobblemonClient.requests.battleChallenges[optionsPacket.targetId] != null
+    val hasTeamRequest = CobblemonClient.requests.multiBattleTeamRequests[optionsPacket.targetId] != null
+    // The way things are positioned should probably be more thought out if more options are added
+    var addBattleOption = false
+    optionsPacket.options.forEach {
+        if (!addBattleOption && (hasChallenge || hasTeamRequest || BattleConfigureGUI.battleRequestMap.containsKey(it.key))) {
+            if(it.value === PlayerInteractOptionsPacket.OptionStatus.AVAILABLE) {
+                options.put(Orientation.NORTH, battle)
+                addBattleOption = true
+            } else {
+                options.put(Orientation.NORTH, InteractWheelOption(
+                    iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_battle.png"),
+                    secondaryIconResource = null,
+                    colour = { Vector3f(0.5f, 0.5f, 0.5f) },
+                    tooltipText = getLangKey(it.value),
+                    onPress = {}
+                ))
+            }
+        }
+        if (it.key == PlayerInteractOptionsPacket.Options.SPECTATE_BATTLE) {
+            if(!hasChallenge) {
+                options.put(Orientation.NORTH, spectate)
+            }
+        }
+        if (it.key == PlayerInteractOptionsPacket.Options.TRADE) {
+            if (it.value == PlayerInteractOptionsPacket.OptionStatus.AVAILABLE) {
+                options.put(Orientation.NORTHEAST, trade)
+            } else {
+                val langKey = getLangKey(it.value)
+                options.put(
+                    Orientation.NORTHEAST, InteractWheelOption(
+                        iconResource = cobblemonResource("textures/gui/interact/interact_wheel_icon_trade.png"),
+                        secondaryIconResource = null,
+                        colour = { Vector3f(0.5f, 0.5f, 0.5f) },
+                        tooltipText = langKey,
+                        onPress = {}
+                    ))
+            }
+        }
+    }
+
+    return InteractWheelGUI(options, Component.translatable("cobblemon.ui.interact.player"))
+}
+
 fun createOption(pokemonID: UUID, changeFormData: Pair<Boolean, String>): InteractWheelOption? {
     var path = ""
     var aspect = changeFormData.second
@@ -118,6 +241,14 @@ fun createOption(pokemonID: UUID, changeFormData: Pair<Boolean, String>): Intera
     return null
 }
 
+private fun getLangKey(status: PlayerInteractOptionsPacket.OptionStatus) : String {
+    return when (status) {
+        PlayerInteractOptionsPacket.OptionStatus.TOO_FAR -> "cobblemon.ui.interact.too_far"
+        PlayerInteractOptionsPacket.OptionStatus.INSUFFICIENT_POKEMON -> "cobblemon.battle.error.no_pokemon_opponent"
+        else -> "cobblemon.ui.interact.unavailable"
+    }
+}
+
 private fun closeGUI() {
     Minecraft.getInstance().setScreen(null)
 }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/config/SpeciesKey.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/config/SpeciesKey.kt
@@ -43,7 +43,7 @@ data class SpeciesKey(val species: ResourceLocation, val aspects: Set<String> =
         val properties = createProperties()
         properties.level = level
         val pokemon = properties.create()
-        //        pokemon.setAspects(aspects());
+        pokemon.forcedAspects = aspects
         return pokemon
     }
 
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/PokemonEntityMixin.java b/common/src/main/java/generations/gg/generations/core/generationscore/common/mixin/PokemonEntityMixin.java
@@ -1,22 +1,17 @@
 package generations.gg.generations.core.generationscore.common.mixin;
 
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviour;
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourSettings;
-import com.cobblemon.mod.common.api.riding.behaviour.RidingBehaviourState;
 import com.cobblemon.mod.common.entity.PlatformType;
 import com.cobblemon.mod.common.entity.pokemon.PokemonEntity;
+import com.cobblemon.mod.common.util.PlayerExtensionsKt;
 import generations.gg.generations.core.generationscore.common.network.packets.GensInteractPokemonUIPacket;
 import generations.gg.generations.core.generationscore.common.util.PokemonEntityFunctionsKt;
 import generations.gg.generations.core.generationscore.common.world.entity.PokemonInteractProxy;
-import kotlin.jvm.functions.Function3;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
-import org.jetbrains.annotations.NotNull;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -32,35 +27,61 @@ private void showInteractionWheel(ServerPlayer player, ItemStack itemStack, Call
        ci.cancel();
     }
 
+    @Inject(method = "mobInteract", at = @At("HEAD"), cancellable = true)
+    private void generations$customShoulderMega(Player player, InteractionHand hand, CallbackInfoReturnable<InteractionResult> cir) {
+        PokemonEntity self = (PokemonEntity) (Object) this;
 
-//    @Inject(method = "mobInteract", at = @At("HEAD"), cancellable = true)
-//    private void generations$customShoulderMega(Player player, InteractionHand hand, CallbackInfoReturnable<InteractionResult> cir) {
-//        PokemonEntity self = (PokemonEntity) (Object) this;
-//
-//        if (hand == InteractionHand.MAIN_HAND && player instanceof ServerPlayer serverPlayer && self.getPokemon().getOwnerPlayer() == player) {
-//            if (player.isShiftKeyDown()) {
-//                boolean canMount = self.canSitOnShoulder();
-//                boolean canChangeForm = PokemonEntityFunctionsKt.canChangeForm(self).getFirst();
-//                String aspect = PokemonEntityFunctionsKt.canChangeForm(self).getSecond();
-//
-//                System.out.println(self.getAspects());
-//                if (!aspect.isEmpty() && self.getAspects().contains(aspect) || self.getAspects().contains("primal") || self.getAspects().contains("ultra-fusion")) {
-//                    aspect = "revert";
-//                }
-//
-//                Pair<Boolean, String> changeFormData = new Pair<>(canChangeForm, aspect);
-//
-//                new GensInteractPokemonUIPacket(self.getUUID(), canMount, changeFormData).sendToPlayer(serverPlayer);
-//                cir.setReturnValue(InteractionResult.SUCCESS);
-//                return;
-//            } else {
-//                if (((PokemonEntityAccessor) self).invokeAttemptItemInteraction(serverPlayer, player.getItemInHand(hand))) {
-//                    cir.setReturnValue(InteractionResult.SUCCESS);
-//                    return;
-//                }
-//            }
-//        }
-//    }
-//
+        if (hand == InteractionHand.MAIN_HAND && player instanceof ServerPlayer serverPlayer && self.getPokemon().getOwnerPlayer() == player) {
+            if (player.isShiftKeyDown()) {
+                ItemStack itemStack = player.getItemInHand(hand);
 
+                boolean canMount = self.canSitOnShoulder() && PlayerExtensionsKt.party(serverPlayer).toGappyList().contains(self.getPokemon());
+
+                boolean canGiveHeld = !(self.getPokemon().heldItem().isEmpty() && itemStack.isEmpty());
+
+                var cosmeticItemDefinition = com.cobblemon.mod.common.CobblemonCosmeticItems.findValidCosmeticForPokemonAndItem(
+                        serverPlayer.level().registryAccess(),
+                        self.getPokemon(),
+                        itemStack
+                );
+
+                boolean canGiveCosmetic =
+                        (!self.getPokemon().getCosmeticItem().isEmpty() && itemStack.isEmpty())
+                                || cosmeticItemDefinition != null;
+
+                boolean canRide = self.ifRidingAvailableSupply(false, (behaviour, settings, state) -> {
+                    if (self.getPlatform() != PlatformType.NONE) return false;
+                    if (self.getTethering() != null) return false;
+                    if (self.getSeats().isEmpty()) return false;
+                    if ((self.getOwner() instanceof ServerPlayer sp) && PlayerExtensionsKt.isInBattle(serverPlayer)) return false;
+                    if (self.getOwner() != serverPlayer && self.getPassengers().isEmpty()) return false;
+                    return behaviour.isActive(settings, state, self);
+                });
+
+                boolean canChangeForm = PokemonEntityFunctionsKt.canChangeForm(self).getFirst();
+                String aspect = PokemonEntityFunctionsKt.canChangeForm(self).getSecond();
+
+                if (!aspect.isEmpty() && self.getAspects().contains(aspect)
+                        || self.getAspects().contains("primal")
+                        || self.getAspects().contains("ultra-fusion")) {
+                    aspect = "revert";
+                }
+
+                Pair<Boolean, String> changeFormData = new Pair<>(canChangeForm, aspect);
+
+                new GensInteractPokemonUIPacket(
+                        self.getUUID(),
+                        canMount,
+                        canGiveHeld,
+                        canGiveCosmetic,
+                        canRide,
+                        changeFormData
+                ).sendToPlayer(serverPlayer);
+
+                cir.setReturnValue(InteractionResult.SUCCESS);
+                return;
+            }
+
+        }
+    }
 }
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/network/packets/GensInteractPokemonUIPacket.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/network/packets/GensInteractPokemonUIPacket.kt
@@ -26,7 +26,8 @@ class GensInteractPokemonUIPacket(
     val canGiveHeld: Boolean,
     val canGiveCosmetic: Boolean,
     val canRide: Boolean,
-    val changeFormData: Pair<Boolean, String>): NetworkPacket<GensInteractPokemonUIPacket> {
+    val changeFormData: Pair<Boolean, String>
+): NetworkPacket<GensInteractPokemonUIPacket> {
 
     override val id = ID
 
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/util/PokemonFunctions.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/util/PokemonFunctions.kt
@@ -189,7 +189,7 @@ fun ItemStack.getPokemon(): Pokemon? {
 
 fun Pokemon.fixIVS() {
     println("Name: ${this.species.name}")
-    val special = isLegendary() || isUltraBeast() || species.name == "ursaluna-bloodmoon" || species.name in setOf(
+    val special = isLegendary() || isUltraBeast() || isMythical() || species.name == "ursaluna-bloodmoon" || species.name in setOf(
         "Gouging Fire",
         "Raging Bolt",
         "Walking Wake",
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/item/GenerationsItems.kt
@@ -1646,7 +1646,7 @@ object GenerationsItems: ItemPlatformRegistry() {
             createFormChangingItem(
                 it,
                 "type",
-                type.name,
+                type.showdownId,
                 cobblemonResource("arceus")
             ).also { CobblemonHeldItemManager.registerRemap(it, name.replace("_", "")) }
         },
@@ -1672,7 +1672,7 @@ object GenerationsItems: ItemPlatformRegistry() {
             createFormChangingItem(
                 it,
                 "type",
-                type.name,
+                type.showdownId(),
                 cobblemonResource("silvally")
             ).also { CobblemonHeldItemManager.registerRemap(it, name.replace("_", "").replace("drive", "")) }
         },
diff --git a/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/BirdShrineBlock.kt b/common/src/main/java/generations/gg/generations/core/generationscore/common/world/level/block/shrines/BirdShrineBlock.kt
diff --git a/gradle.properties b/gradle.properties

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ data class SpeciesKey(val species: ResourceLocation, val aspects: Set<String> =`
`43`	`43`	`val properties = createProperties()`
`44`	`44`	`properties.level = level`
`45`	`45`	`val pokemon = properties.create()`
`46`		`- // pokemon.setAspects(aspects());`
	`46`	`+ pokemon.forcedAspects = aspects`
`47`	`47`	`return pokemon`
`48`	`48`	`}`
`49`	`49`