Commit 75cc2c04e7a3dc1a1be29cba6cf9d5043eb56164
1 parent
fd2df210
Minor changes, mainly to trigger CI
Showing
2 changed files
with
5 additions
and
4 deletions
src/client/java/com/mumfrey/liteloader/client/api/LiteLoaderCoreAPIClient.java
| @@ -52,9 +52,8 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI | @@ -52,9 +52,8 @@ public class LiteLoaderCoreAPIClient extends LiteLoaderCoreAPI | ||
| 52 | public String[] getMixinConfigs() | 52 | public String[] getMixinConfigs() |
| 53 | { | 53 | { |
| 54 | String[] commonConfigs = super.getMixinConfigs(); | 54 | String[] commonConfigs = super.getMixinConfigs(); |
| 55 | - return ObjectArrays.concat(commonConfigs, new String[] { | ||
| 56 | - "mixins.liteloader.client.json" | ||
| 57 | - }, String.class); | 55 | + String[] clientConfigs = new String[] { "mixins.liteloader.client.json" }; |
| 56 | + return ObjectArrays.concat(commonConfigs, clientConfigs, String.class); | ||
| 58 | } | 57 | } |
| 59 | 58 | ||
| 60 | /* (non-Javadoc) | 59 | /* (non-Javadoc) |
src/main/java/com/mumfrey/liteloader/interfaces/LoadableFile.java
| @@ -21,6 +21,8 @@ import java.util.regex.Pattern; | @@ -21,6 +21,8 @@ import java.util.regex.Pattern; | ||
| 21 | import java.util.zip.ZipEntry; | 21 | import java.util.zip.ZipEntry; |
| 22 | import java.util.zip.ZipFile; | 22 | import java.util.zip.ZipFile; |
| 23 | 23 | ||
| 24 | +import org.spongepowered.asm.util.Constants.ManifestAttributes; | ||
| 25 | + | ||
| 24 | import com.google.common.io.Files; | 26 | import com.google.common.io.Files; |
| 25 | import com.google.common.primitives.Ints; | 27 | import com.google.common.primitives.Ints; |
| 26 | import com.mumfrey.liteloader.core.api.LoadableModFile; | 28 | import com.mumfrey.liteloader.core.api.LoadableModFile; |
| @@ -44,7 +46,7 @@ public class LoadableFile extends File implements TweakContainer<File> | @@ -44,7 +46,7 @@ public class LoadableFile extends File implements TweakContainer<File> | ||
| 44 | public static final String MFATT_TWEAK_VERSION = "TweakVersion"; | 46 | public static final String MFATT_TWEAK_VERSION = "TweakVersion"; |
| 45 | public static final String MFATT_IMPLEMENTATION_VENDOR = "Implementation-Vendor"; | 47 | public static final String MFATT_IMPLEMENTATION_VENDOR = "Implementation-Vendor"; |
| 46 | public static final String MFATT_TWEAK_AUTHOR = "TweakAuthor"; | 48 | public static final String MFATT_TWEAK_AUTHOR = "TweakAuthor"; |
| 47 | - public static final String MFATT_MIXIN_CONFIGS = "MixinConfigs"; | 49 | + public static final String MFATT_MIXIN_CONFIGS = ManifestAttributes.MIXINCONFIGS; |
| 48 | public static final String MFATT_INJECTION_STRATEGY = "TweakInjectionStrategy"; | 50 | public static final String MFATT_INJECTION_STRATEGY = "TweakInjectionStrategy"; |
| 49 | 51 | ||
| 50 | private static final Pattern versionPattern = Pattern.compile("([0-9]+\\.)+[0-9]+([_A-Z0-9]+)?"); | 52 | private static final Pattern versionPattern = Pattern.compile("([0-9]+\\.)+[0-9]+([_A-Z0-9]+)?"); |