Update time!

Updated to Pixelmon 9.1.10 for 1.16 and Pixelmon 9.2.6 for 1.20.
Neovitalism · Dec 31, 2023 · 3a774be · 3a774be
1 parent 1e28eb4
commit 3a774be
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/forge116/build.gradle b/forge116/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     implementation 'org.jetbrains:annotations:24.0.1'
 
     minecraft 'net.minecraftforge:forge:1.16.5-36.2.34'
-    implementation fg.deobf('pixelmon:Pixelmon-1.16.5-9.1.7-server:9.1.7')
+    implementation fg.deobf('pixelmon:Pixelmon-1.16.5-9.1.10-server:9.1.10')
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 }
 

diff --git a/forge120/build.gradle b/forge120/build.gradle
@@ -50,7 +50,7 @@ dependencies {
     implementation 'org.jetbrains:annotations:24.0.1'
 
     minecraft "net.minecraftforge:forge:1.20.2-48.0.30"
-    implementation fg.deobf('pixelmon:Pixelmon-1.20.2-9.2.4-server:9.2.4')
+    implementation fg.deobf('pixelmon:Pixelmon-1.20.2-9.2.6-server:9.2.6')
     annotationProcessor 'org.spongepowered:mixin:0.8.5:processor'
 }
 

diff --git a/forge120/src/main/java/me/neovitalism/goodbyegroupspawns/mixins/GroupSpawnSettingsMixin.java b/forge120/src/main/java/me/neovitalism/goodbyegroupspawns/mixins/GroupSpawnSettingsMixin.java
@@ -1,5 +1,8 @@
 package me.neovitalism.goodbyegroupspawns.mixins;
 
+import com.pixelmonmod.pixelmon.api.spawning.AbstractSpawner;
+import com.pixelmonmod.pixelmon.api.spawning.SpawnLocation;
+import com.pixelmonmod.pixelmon.api.spawning.archetypes.entities.pokemon.SpawnInfoPokemon;
 import com.pixelmonmod.pixelmon.api.spawning.archetypes.group.GroupSpawnSettings;
 import com.pixelmonmod.pixelmon.entities.SpawnLocationType;
 import com.pixelmonmod.pixelmon.entities.pixelmon.PixelmonEntity;
@@ -24,7 +27,17 @@ public boolean shouldSpawn() {
      * @reason GoodbyeGroupSpawns
      */
     @Overwrite
-    public PixelmonEntity spawnPokemon(Level level, BlockPos center, SpawnLocationType spawnLocationType, int flockId) {
+    public int getRandomAmount() {
+        return 0;
+    }
+
+    /**
+     * @author Neovitalism
+     * @reason GoodbyeGroupSpawns
+     */
+    @Overwrite
+    public PixelmonEntity spawnPokemon(Level par1, BlockPos par2, SpawnLocationType par3, int par4,
+                                       AbstractSpawner par5, SpawnInfoPokemon par6, SpawnLocation par7) {
         return null;
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-mod_version = 1.0.1
+mod_version = 1.0.2
 mod_id = goodbyegroupspawns
 mod_name = GoodbyeGroupSpawns
 mod_description = Disables Pixelmon's group spawning.