diff options
author | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:03:53 -0800 |
---|---|---|
committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:03:53 -0800 |
commit | f51616bda220887fdd45c4bc951ff59e3398213a (patch) | |
tree | 35fdbb15b4c7ea0282773a388eff517a1d09d941 /src/main/java/kubatech/mixin | |
parent | 11216d666cbc30fc1e1dfc84e1e0c2f4252b1fc2 (diff) | |
download | GT5-Unofficial-f51616bda220887fdd45c4bc951ff59e3398213a.tar.gz GT5-Unofficial-f51616bda220887fdd45c4bc951ff59e3398213a.tar.bz2 GT5-Unofficial-f51616bda220887fdd45c4bc951ff59e3398213a.zip |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/kubatech/mixin')
5 files changed, 27 insertions, 18 deletions
diff --git a/src/main/java/kubatech/mixin/Mixin.java b/src/main/java/kubatech/mixin/Mixin.java index 2a3259ef60..79ae40951f 100644 --- a/src/main/java/kubatech/mixin/Mixin.java +++ b/src/main/java/kubatech/mixin/Mixin.java @@ -2,12 +2,14 @@ package kubatech.mixin; import static kubatech.mixin.TargetedMod.VANILLA; -import cpw.mods.fml.relauncher.FMLLaunchHandler; import java.util.Arrays; import java.util.HashSet; import java.util.List; +import cpw.mods.fml.relauncher.FMLLaunchHandler; + public enum Mixin { + // Minecraft EnchantmentHelperMixin("minecraft.EnchantmentHelperMixin", VANILLA), WorldMixin("minecraft.WorldMixin", VANILLA); @@ -29,9 +31,8 @@ public enum Mixin { } public boolean shouldLoad(List<TargetedMod> loadedMods) { - return (side == Side.BOTH - || side == Side.SERVER && FMLLaunchHandler.side().isServer() - || side == Side.CLIENT && FMLLaunchHandler.side().isClient()) + return (side == Side.BOTH || side == Side.SERVER && FMLLaunchHandler.side().isServer() + || side == Side.CLIENT && FMLLaunchHandler.side().isClient()) && new HashSet<>(loadedMods).containsAll(targetedMods); } } diff --git a/src/main/java/kubatech/mixin/MixinPlugin.java b/src/main/java/kubatech/mixin/MixinPlugin.java index be00dc9817..31f1a67a9e 100644 --- a/src/main/java/kubatech/mixin/MixinPlugin.java +++ b/src/main/java/kubatech/mixin/MixinPlugin.java @@ -3,7 +3,6 @@ package kubatech.mixin; import static java.nio.file.Files.walk; import static kubatech.mixin.TargetedMod.VANILLA; -import com.gtnewhorizon.gtnhmixins.MinecraftURLClassPath; import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; @@ -14,14 +13,19 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; import java.util.stream.Stream; + import kubatech.Tags; + import net.minecraft.launchwrapper.Launch; + import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; import org.spongepowered.asm.mixin.extensibility.IMixinInfo; import org.spongepowered.libraries.org.objectweb.asm.tree.ClassNode; +import com.gtnewhorizon.gtnhmixins.MinecraftURLClassPath; + @SuppressWarnings("unused") public class MixinPlugin implements IMixinConfigPlugin { @@ -92,10 +96,7 @@ public class MixinPlugin implements IMixinConfigPlugin { public static File findJarOf(final TargetedMod mod) { try (Stream<Path> stream = walk(MODS_DIRECTORY_PATH)) { - return stream.filter(mod::isMatchingJar) - .map(Path::toFile) - .findFirst() - .orElse(null); + return stream.filter(mod::isMatchingJar).map(Path::toFile).findFirst().orElse(null); } catch (IOException e) { e.printStackTrace(); return null; diff --git a/src/main/java/kubatech/mixin/TargetedMod.java b/src/main/java/kubatech/mixin/TargetedMod.java index c65fadbde2..60432334be 100644 --- a/src/main/java/kubatech/mixin/TargetedMod.java +++ b/src/main/java/kubatech/mixin/TargetedMod.java @@ -1,11 +1,12 @@ package kubatech.mixin; -import com.google.common.io.Files; import java.nio.file.Path; +import com.google.common.io.Files; + public enum TargetedMod { - VANILLA("Minecraft", "unused", true), - ; + + VANILLA("Minecraft", "unused", true),; public final String modName; public final String jarNamePrefixLowercase; @@ -29,7 +30,11 @@ public enum TargetedMod { @Override public String toString() { return "TargetedMod{" + "modName='" - + modName + '\'' + ", jarNamePrefixLowercase='" - + jarNamePrefixLowercase + '\'' + '}'; + + modName + + '\'' + + ", jarNamePrefixLowercase='" + + jarNamePrefixLowercase + + '\'' + + '}'; } } diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java index e07c0d335a..a2fffbcf57 100644 --- a/src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java +++ b/src/main/java/kubatech/mixin/mixins/minecraft/EnchantmentHelperMixin.java @@ -3,11 +3,14 @@ package kubatech.mixin.mixins.minecraft; import static kubatech.loaders.MobRecipeLoader.randomEnchantmentDetectedString; import java.util.Random; + import kubatech.api.utils.FastRandom; import kubatech.loaders.MobRecipeLoader; + import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagInt; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; @@ -21,10 +24,7 @@ public class EnchantmentHelperMixin { private static final Random rnd = new FastRandom(); @Inject(method = "addRandomEnchantment", at = @At("HEAD"), require = 1) - private static void addRandomEnchantmentDetector( - Random random, - ItemStack itemStack, - int enchantabilityLevel, + private static void addRandomEnchantmentDetector(Random random, ItemStack itemStack, int enchantabilityLevel, CallbackInfoReturnable<ItemStack> callbackInfoReturnable) { if (MobRecipeLoader.isInGenerationProcess && random instanceof MobRecipeLoader.fakeRand) { itemStack.setTagInfo(randomEnchantmentDetectedString, new NBTTagInt(enchantabilityLevel)); diff --git a/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java b/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java index 320917c694..8ff7f56a9f 100644 --- a/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java +++ b/src/main/java/kubatech/mixin/mixins/minecraft/WorldMixin.java @@ -1,8 +1,10 @@ package kubatech.mixin.mixins.minecraft; import kubatech.loaders.BlockLoader; + import net.minecraft.block.Block; import net.minecraft.world.World; + import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; |