Skip to content

Commit

Permalink
why the hell not
Browse files Browse the repository at this point in the history
  • Loading branch information
Neovitalism committed Nov 18, 2024
1 parent fa14a91 commit 542981e
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 173 deletions.
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package me.neovitalism.neomixins;
package me.neovitalism.advancedspecpatch;

import net.minecraftforge.fml.common.Mod;
import org.apache.logging.log4j.Level;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

@Mod("neomixins")
public class NeoMixins {
@Mod("advancedspecpatch")
public class AdvancedSpecPatch {
private static final Logger LOGGER = LogManager.getLogger();

public NeoMixins() {
public AdvancedSpecPatch() {
LOGGER.log(Level.INFO, "Loaded!");
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package me.neovitalism.advancedspecpatch.mixins;

import com.pixelmonmod.api.pokemon.requirement.AbstractBooleanPokemonRequirement;
import com.pixelmonmod.api.pokemon.requirement.impl.UltraBeastRequirement;
import com.pixelmonmod.pixelmon.api.pokemon.Pokemon;
import com.pixelmonmod.pixelmon.api.registries.PixelmonSpecies;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite;

import java.util.Set;

@Mixin(value = UltraBeastRequirement.class, remap = false)
public abstract class UltraBeastRequirementMixin extends AbstractBooleanPokemonRequirement {
public UltraBeastRequirementMixin(Set<String> keys) {
super(keys);
}

/**
* @author Neovitalism
* @reason Make it work (and optimize it a bit)!
*/
@Overwrite
public void applyData(Pokemon pixelmon) {
if (this.value && !pixelmon.isUltraBeast()) {
pixelmon.setSpecies(PixelmonSpecies.getRandomUltraBeast(), false);
} else if (!this.value && pixelmon.isUltraBeast()) {
pixelmon.setSpecies(PixelmonSpecies.getRandomSpecies(false, false, true), false);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"target": "@env(DEFAULT)",
"compatibilityLevel": "JAVA_8",
"mixins": [

"UltraBeastRequirementMixin"
],
"injectors": {
"defaultRequire": 1
Expand Down
104 changes: 0 additions & 104 deletions forge120/build.gradle

This file was deleted.

15 changes: 0 additions & 15 deletions forge120/src/main/java/me/neovitalism/neomixins/NeoMixins.java

This file was deleted.

24 changes: 0 additions & 24 deletions forge120/src/main/resources/META-INF/mods.toml

This file was deleted.

14 changes: 0 additions & 14 deletions forge120/src/main/resources/mixins.neomixins.json

This file was deleted.

6 changes: 0 additions & 6 deletions forge120/src/main/resources/pack.mcmeta

This file was deleted.

8 changes: 4 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
mod_version = 1.0.0
mod_id = neomixins
mod_name = NeoMixins
mod_description = Mixins for use with Pixelmon
github_page = https://github.com/Neovitalism/NeoMixins
mod_id = advancedspecpatch
mod_name = AdvancedSpecPatch
mod_description = Patches specific specs.
github_page = https://github.com/Neovitalism/NeoMixins/tree/advanced-spec-patch
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
rootProject.name = 'NeoMixins'
rootProject.name = 'AdvancedSpecPatch'
include 'forge116'
include 'forge120'

0 comments on commit 542981e

Please sign in to comment.