reformat code

This commit is contained in:
FalsePattern committed 2022-06-08 16:01:06 +02:00
1 parent c4248f7100
commit 025b47669f
21 files changed
+731 -498

No files matched your search

@@ -1,24 +1,29 @@
package com.falsepattern.lib.mixin;
import cpw.mods.fml.relauncher.FMLLaunchHandler;
import lombok.val;
import java.util.List;
import java.util.function.Predicate;
import java.util.function.Supplier;
import lombok.val;
public interface IMixin {
Side getSide();
String getMixin();
Predicate<List<ITargetedMod>> getFilter();
default boolean shouldLoad(List<ITargetedMod> loadedMods) {
val side = getSide();
return (side == Side.COMMON
|| side == Side.SERVER && FMLLaunchHandler.side().isServer()
|| side == Side.CLIENT && FMLLaunchHandler.side().isClient())
&& getFilter().test(loadedMods);
return (side == Side.COMMON || side == Side.SERVER && FMLLaunchHandler.side().isServer() ||
side == Side.CLIENT && FMLLaunchHandler.side().isClient()) && getFilter().test(loadedMods);
}
Side getSide();
Predicate<List<ITargetedMod>> getFilter();
enum Side {
COMMON,
CLIENT,
SERVER
}
final class PredicateHelpers {
@@ -42,10 +47,4 @@ public interface IMixin {
return (list) -> !list.contains(mod);
}
}
enum Side {
COMMON,
CLIENT,
SERVER
}
}
@@ -1,14 +1,6 @@
package com.falsepattern.lib.mixin;
import com.falsepattern.lib.internal.CoreLoadingPlugin;
import lombok.val;
import net.minecraft.launchwrapper.Launch;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.lib.tree.ClassNode;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -18,16 +10,19 @@ import java.util.Arrays;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import lombok.val;
import net.minecraft.launchwrapper.Launch;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.lib.tree.ClassNode;
import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin;
import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
import static java.nio.file.Files.walk;
public interface IMixinPlugin extends IMixinConfigPlugin {
Path MODS_DIRECTORY_PATH = CoreLoadingPlugin.mcDir.toPath().resolve("mods");
Logger getLogger();
ITargetedMod[] getTargetedModEnumValues();
IMixin[] getMixinEnumValues();
static Logger createLogger(String modName) {
return LogManager.getLogger(modName + " Mixin Loader");
}
@@ -57,15 +52,13 @@ public interface IMixinPlugin extends IMixinConfigPlugin {
val isDevelopmentEnvironment = (boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment");
val targetedMods = getTargetedModEnumValues();
val loadedMods = Arrays.stream(targetedMods)
.filter(mod -> (mod.isLoadInDevelopment() && isDevelopmentEnvironment)
|| loadJarOf(mod))
.filter(mod -> (mod.isLoadInDevelopment() && isDevelopmentEnvironment) || loadJarOf(mod))
.collect(Collectors.toList());
for (val mod : targetedMods) {
if(loadedMods.contains(mod)) {
if (loadedMods.contains(mod)) {
getLogger().info("Found " + mod.getModName() + "! Integrating now...");
}
else {
} else {
getLogger().info("Could not find " + mod.getModName() + "! Skipping integration....");
}
}
@@ -81,27 +74,19 @@ public interface IMixinPlugin extends IMixinConfigPlugin {
return mixins;
}
@Override
default void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
}
@Override
default void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
}
ITargetedMod[] getTargetedModEnumValues();
default boolean loadJarOf(final ITargetedMod mod) {
boolean success = false;
try {
File jar = findJarOf(mod);
if(jar == null) {
if (jar == null) {
getLogger().info("Jar not found for " + mod);
return false;
}
getLogger().info("Attempting to add " + jar + " to the URL Class Path");
success = true;
if(!jar.exists()) {
if (!jar.exists()) {
success = false;
throw new FileNotFoundException(jar.toString());
}
@@ -112,17 +97,26 @@ public interface IMixinPlugin extends IMixinConfigPlugin {
return success;
}
Logger getLogger();
IMixin[] getMixinEnumValues();
static File findJarOf(final ITargetedMod mod) {
try {
return walk(MODS_DIRECTORY_PATH)
.filter(mod::isMatchingJar)
.map(Path::toFile)
.findFirst()
.orElse(null);
}
catch (IOException e) {
return walk(MODS_DIRECTORY_PATH).filter(mod::isMatchingJar).map(Path::toFile).findFirst().orElse(null);
} catch (IOException e) {
e.printStackTrace();
return null;
}
}
@Override
default void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
}
@Override
default void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {
}
}
@@ -1,14 +1,13 @@
package com.falsepattern.lib.mixin;
import com.google.common.io.Files;
import java.nio.file.Path;
import java.util.function.Predicate;
public interface ITargetedMod {
String getModName();
Predicate<String> getCondition();
boolean isLoadInDevelopment();
default boolean isMatchingJar(Path path) {
@@ -19,6 +18,8 @@ public interface ITargetedMod {
return "jar".equals(fileExtension) && getCondition().test(nameLowerCase);
}
Predicate<String> getCondition();
final class PredicateHelpers {
public static Predicate<String> startsWith(String subString) {
return (name) -> name.startsWith(subString);
@@ -2,24 +2,23 @@ package com.falsepattern.lib.mixin;
import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModClassLoader;
import java.io.File;
import java.lang.reflect.Method;
import java.net.URL;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import lombok.val;
import net.minecraft.launchwrapper.LaunchClassLoader;
import java.io.File;
import java.lang.reflect.Method;
import java.net.URL;
/**
* Backport from spongemixins 1.3 for compat with the curseforge 1.2.0 version.
*
* <p>
* Also added Grimoire protection.
*/
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class MinecraftURLClassPath {
/**
* Utility to manipulate the minecraft URL ClassPath
* Utility to manipulate the minecraft URL ClassPath
*/
private static final Object ucp;
@@ -65,11 +64,12 @@ public final class MinecraftURLClassPath {
}
/**
* Adds a Jar to the Minecraft URL ClassPath
* - Needed when using mixins on classes outside of Minecraft or other coremods
* Adds a Jar to the Minecraft URL ClassPath - Needed when using mixins on classes outside of Minecraft or other
* coremods
*/
public static void addJar(File pathToJar) throws Exception {
if (!GRIMOIRE)
if (!GRIMOIRE) {
addURL.invoke(ucp, pathToJar.toURI().toURL());
}
}
}