Fix 1.8 forge support

This commit is contained in:
xfl03 committed 2019-03-04 20:12:13 +08:00
1 parent 88763d64ef
commit 030daf12a2
8 files changed
+52 -84

No files matched your search

+3 -4
View File
@@ -1,9 +1,5 @@
modLoader="javafml"
loaderVersion="[25,)"
issueTrackerURL="https://github.com/xfl03/MCCustomSkinLoader/issues"
displayURL="https://github.com/xfl03/MCCustomSkinLoader"
credits="GPLv3"
authors=["xfl03", "JLChnToZ"]
[[mods]]
modId="customskinloader"
version="${modFullVersion}"
@@ -11,6 +7,9 @@ displayName="CustomSkinLoader"
description='''
Custom Skin Loader for Minecraft
'''
issueTrackerURL="https://github.com/xfl03/MCCustomSkinLoader/issues"
displayURL="https://github.com/xfl03/MCCustomSkinLoader"
authors=["xfl03", "JLChnToZ"]
[[dependencies.customskinloader]]
modId="forge"
mandatory=true
+1 -2
View File
@@ -5,7 +5,6 @@
"description": "Custom Skin Loader for Minecraft",
"version": "${modFullVersion}",
"url": "https://github.com/xfl03/MCCustomSkinLoader",
"authorList": ["xfl03", "JLChnToZ"],
"credits": "GPLv3"
"authorList": ["xfl03", "JLChnToZ"]
}
]
@@ -1,10 +1,40 @@
package customskinloader.forge;
import customskinloader.CustomSkinLoader;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent;
/**
* Forge Mod Container for 1.13+
* Forge Mod Container
*/
@Mod("customskinloader")
@Mod(
value = "customskinloader",
modid = "customskinloader",
name = "CustomSkinLoader",
version = "@MOD_FULL_VERSION@",
clientSideOnly = true,
acceptedMinecraftVersions = "[1.8,)",
certificateFingerprint = "52885f395e68f42e9b3b629ba56ecf606f7d4269"
)//1.13-
public class ForgeMod {
}
@EventHandler
public void fingerprintError(FMLFingerprintViolationEvent event) {
if (event.isDirectory()) return;//Development Environment
CustomSkinLoader.logger.warning("!!!Fingerprint ERROR!!!");
CustomSkinLoader.logger.warning("Failed to check fingerprint in file '" + event.getSource().getAbsolutePath() + "'.");
CustomSkinLoader.logger.warning("Excepted Fingerprint: " + event.getExpectedFingerprint());
if (event.getFingerprints().isEmpty()) {
CustomSkinLoader.logger.warning("No Fingerprint Founded.");
} else {
CustomSkinLoader.logger.warning("Founded Fingerprint: ");
for (String s : event.getFingerprints())
CustomSkinLoader.logger.warning(s);
}
throw new RuntimeException("Fingerprint ERROR, please **DO NOT MODIFY** any mod.");
}
}
@@ -1,41 +0,0 @@
package customskinloader.forge;
import customskinloader.CustomSkinLoader;
import net.minecraftforge.fml.common.FMLModContainer;
import net.minecraftforge.fml.common.Mod.EventHandler;
import net.minecraftforge.fml.common.discovery.ModCandidate;
import net.minecraftforge.fml.common.event.FMLFingerprintViolationEvent;
import java.util.Map;
/**
* Forge Mod Container for 1.13-
*/
@ModOld(
modid = "customskinloader",
name = "CustomSkinLoader",
version = "@MOD_FULL_VERSION@",
clientSideOnly = true,
acceptedMinecraftVersions = "[1.8,)",
certificateFingerprint = "52885f395e68f42e9b3b629ba56ecf606f7d4269"
)//1.13-
public class ForgeModOld {
@EventHandler
public void fingerprintError(FMLFingerprintViolationEvent event) {
if (event.isDirectory()) return;//Development Environment
CustomSkinLoader.logger.warning("!!!Fingerprint ERROR!!!");
CustomSkinLoader.logger.warning("Failed to check fingerprint in file '" + event.getSource().getAbsolutePath() + "'.");
CustomSkinLoader.logger.warning("Excepted Fingerprint: " + event.getExpectedFingerprint());
if (event.getFingerprints().isEmpty()) {
CustomSkinLoader.logger.warning("No Fingerprint Founded.");
} else {
CustomSkinLoader.logger.warning("Founded Fingerprint: ");
for (String s : event.getFingerprints())
CustomSkinLoader.logger.warning(s);
}
throw new RuntimeException("Fingerprint ERROR, please **DO NOT MODIFY** any mod.");
}
}
@@ -2,19 +2,11 @@ package customskinloader.forge;
import java.util.Map;
import net.minecraftforge.fml.common.FMLModContainer;
import net.minecraftforge.fml.common.ModContainerFactory;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin.Name;
import org.objectweb.asm.Type;
@Name("CustomSkinLoader")
public class ForgePlugin implements IFMLLoadingPlugin {
static{
//Transform Annotation in 1.13-
ModContainerFactory.instance().registerContainerType(Type.getType(ModOld.class), FMLModContainer.class);
}
@Override
public String[] getASMTransformerClass() {
@@ -1,23 +0,0 @@
package customskinloader.forge;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
//https://github.com/MinecraftForge/MinecraftForge/blob/1.12.x/src/main/java/net/minecraftforge/fml/common/Mod.java
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface ModOld {
String modid();
String name() default "";
String version() default "";
boolean clientSideOnly() default false;
String acceptedMinecraftVersions() default "";
String certificateFingerprint() default "";
}
@@ -6,12 +6,24 @@ import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
//https://github.com/MinecraftForge/MinecraftForge/blob/1.13.x/src/main/java/net/minecraftforge/fml/common/Mod.java
//https://github.com/MinecraftForge/MinecraftForge/blob/1.12.x/src/main/java/net/minecraftforge/fml/common/Mod.java
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
public @interface Mod {
String value();
//From 1.12.x
String modid();
String name() default "";
String version() default "";
boolean clientSideOnly() default false;
String acceptedMinecraftVersions() default "";
String certificateFingerprint() default "";
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.METHOD)
@interface EventHandler {
+2 -2
View File
@@ -1,6 +1,6 @@
name=CustomSkinLoader
group=customskinloader
version=14.10
dev_version=
dev_version=a
#RELEASE: snapshot=0
snapshot=0
snapshot=1