Support Vanilla and Fabric 1.17.1. Remove Vanilla 1.17. (#175)

This commit is contained in:
ZekerZhayard authored and GitHub committed 2021-07-07 00:21:36 +08:00
1 parent dc5ecfb576
commit ab7aebb753
21 files changed
+136 -389

No files matched your search

+16 -85
View File
@@ -1,105 +1,36 @@
/**
* Gradle Script for Remap
* Designed for remapping jar.
* Remap Jar: mcp<->srg<->notch
* Gradle Script for Converting Mappings
* Designed for Converting Mappings.
* Converting Mappings: tsrg->srg
*/
buildscript {
repositories {
mavenCentral()
maven {
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
}
dependencies {
classpath 'net.md-5:SpecialSource:1.8.6'
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath "org.cadixdev:lorenz:0.5.7"
}
}
import net.md_5.specialsource.JarMapping
import net.md_5.specialsource.JarRemapper
import net.md_5.specialsource.provider.JarProvider
import net.md_5.specialsource.provider.JointProvider
void reobfSrgToNotch() {
def srgName = "${archivesBaseName}-${version}-srg.jar"
def notchName = srgName.replace('-srg', '')
if (config.srg_notch_map == null) {
//Default Map
def mcpName = srgName.replace('-srg', '-dev')
applySpecialSource(srgName, mcpName, getDefaultMap("srg-mcp"))
applySpecialSource(mcpName, notchName, getDefaultMap("mcp-notch"))
} else {
//Custom Map
applySpecialSource(srgName, notchName, config.srg_notch_map)
}
}
void applySpecialSource(String inputName, String outputName, String mapFile) {
def mapping = new JarMapping()
def srgFile = file(mapFile)
def inputFile = file("build/libs/${inputName}")
def outputFile = file("build/libs/${outputName}")
def remapper = new JarRemapper(null, mapping)
def inputJar = net.md_5.specialsource.Jar.init(inputFile)
def inheritanceProviders = new JointProvider()
def jarProvider = new JarProvider(inputJar)
inheritanceProviders.add(jarProvider)
mapping.loadMappings(srgFile)
mapping.setFallbackInheritanceProvider(inheritanceProviders)
remapper.remapJar(inputJar, outputFile)
}
String getDefaultMap(String srgType) {
def mcpVersion = minecraft.mappings.replace('_', "/")
return System.getProperty('user.home') + "/.gradle/caches/minecraft/de/oceanlabs/mcp/mcp_${mcpVersion}/${config.forge_mc_version}/srgs/${srgType}.srg"
}
import org.cadixdev.lorenz.MappingSet
import org.cadixdev.lorenz.io.srg.SrgWriter
import org.cadixdev.lorenz.io.srg.tsrg.TSrgReader
static void tsrg2srg(File tsrg, File srg) {
if (!tsrg.exists()) {
return
}
if (!srg.getParentFile().exists()) {
srg.getParentFile().mkdirs()
if (!tsrg.exists()) return
if (!srg.parentFile.exists()) srg.parentFile.mkdirs()
MappingSet.create().with { set ->
tsrg.withReader "UTF-8", { reader ->
new TSrgReader(reader).read(set)
}
srg.withWriter "UTF-8", { writer ->
new SrgWriter(writer).write(set)
}
}
srg.deleteOnExit()
String mcpClass = "", obfClass = ""
Map<String, String> map = new HashMap<>()
for (String line : tsrg.readLines("UTF-8")) {
String[] strs = line.split($/\s/$)
if (!line.startsWith("\t")) {
mcpClass = strs[0]
obfClass = strs[1]
map.put "L" + mcpClass + ";", "L" + obfClass + ";"
}
}
String srgStr = "";
for (String line : tsrg.readLines("UTF-8")) {
String[] strs = line.split($/\s/$)
if (!line.startsWith("\t")) {
mcpClass = strs[0]
obfClass = strs[1]
srgStr += "CL: ${-> mcpClass} ${-> obfClass}\n"
} else if (strs.length == 3) {
srgStr += "FD: ${-> mcpClass}/${-> strs[1]} ${-> obfClass}/${-> strs[2]}\n"
} else if (strs.length == 4) {
String mcpDesc = strs[2]
String obfDesc = mcpDesc
map.forEach {k, v ->
obfDesc = obfDesc.replace(k, v)
}
srgStr += "MD: ${-> mcpClass}/${-> strs[1]} ${-> strs[2]} ${-> obfClass}/${-> strs[3]} ${-> obfDesc}\n"
}
}
srg.write srgStr, "UTF-8"
}
ext {
reobfSrgToNotch = this.&reobfSrgToNotch
tsrg2srg = this.&tsrg2srg
}
@@ -92,10 +92,6 @@ public class MinecraftUtil {
return HttpUtil0.isLanServer(getStandardServerAddress());
}
public static String getCurrentUsername() {
return Minecraft.getMinecraft().getSession().getProfile().getName();
}
private final static Pattern MINECRAFT_CORE_FILE_PATTERN = Pattern.compile("^(.*?)/versions/([^\\/\\\\]*?)/([^\\/\\\\]*?).jar$");
private static void testProbe() {
@@ -114,27 +110,6 @@ public class MinecraftUtil {
}
}
public static boolean isCoreFile(URL url) {
return regexMatch(url, MINECRAFT_CORE_FILE_PATTERN);
}
private final static Pattern LIBRARY_FILE_PATTERN = Pattern.compile("^(.*?)/libraries/(.*?)/([^\\/\\\\]*?).jar$");
public static boolean isLibraryFile(URL url) {
return regexMatch(url, LIBRARY_FILE_PATTERN);
}
private static boolean regexMatch(URL url, Pattern p) {
Matcher m;
try {
m = p.matcher(URLDecoder.decode(url.getPath(), "UTF-8"));
} catch (Exception e) {
e.printStackTrace();
return false;
}
return m.matches();
}
public static String getCredential(GameProfile profile) {
return (profile == null || profile.hashCode() == 0) ? null :
(profile.getId() == null ? profile.getName() : String.format("%s-%s", profile.getName(), profile.getId()));
-3
View File
@@ -10,7 +10,6 @@ net/minecraft/client/Minecraft net/minecraft/class_310
getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; method_1558
getMinecraft ()Lnet/minecraft/client/Minecraft; method_1551
getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; method_1478
getSession ()Lnet/minecraft/util/Session; method_1548
getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; method_1495
getSkinManager ()Lnet/minecraft/client/resources/SkinManager; method_1582
getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; method_1531
@@ -56,7 +55,5 @@ net/minecraft/client/resources/SkinManager$SkinAvailableCallback net/minecraft/c
skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable
net/minecraft/tileentity/TileEntitySkull net/minecraft/class_2631
net/minecraft/util/ResourceLocation net/minecraft/class_2960
net/minecraft/util/Session net/minecraft/class_320
getProfile ()Lcom/mojang/authlib/GameProfile; method_1677
net/minecraft/util/StringUtils net/minecraft/class_3544
stripControlCodes (Ljava/lang/String;)Ljava/lang/String; method_15440
+2 -2
View File
@@ -4,7 +4,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath "org.cadixdev:mercury:0.1.0-rc1"
classpath "org.cadixdev:mercury:0.1.0"
}
}
@@ -43,7 +43,7 @@ import org.cadixdev.mercury.Mercury
import org.cadixdev.mercury.remapper.MercuryRemapper
tasks.extractRangemapReplacedMain.doFirst {
// Because of https://github.com/MinecraftForge/ForgeGradle/blob/6084129e4f407eca9fee6826aaa3276fe796553e/build.gradle#L147-L240,
// Because of https://github.com/MinecraftForge/ForgeGradle/blob/62f37569f3afc044489e7606d2eb4c2509a85fb8/build.gradle#L152-L245,
// ForgeGradle modified Eclipse JDT and Mercury will call related methods,
// so here must be some hacks.
RangeExtractor.INSTANCE = new RangeExtractor().with {
+1 -1
View File
@@ -1,5 +1,5 @@
minecraft_version=1.14
minecraft_full_versions=1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17
minecraft_full_versions=1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15,1.15.1,1.15.2,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17,1.17.1
#forge gradle needs forge version
forge_mc_version=1.12.2
forge_version=14.23.5.2768
+5
View File
@@ -12,6 +12,11 @@ jar {
exclude 'net/minecraftforge/**'
}
tasks.signJar {
// To prevent modlauncher from checking signer information about Minecraft classes in CustomSkinLoader jar after forge-1.16.3-34.1.27.
exclude "net/minecraft/client/**"
}
projectImplementation project(':Common')
minecraft {
-3
View File
@@ -10,7 +10,6 @@ net/minecraft/client/Minecraft bib
getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; C
getMinecraft ()Lnet/minecraft/client/Minecraft; z
getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; O
getSession ()Lnet/minecraft/util/Session; K
getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; X
getSkinManager ()Lnet/minecraft/client/resources/SkinManager; Y
getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; N
@@ -56,7 +55,5 @@ net/minecraft/client/resources/SkinManager$SkinAvailableCallback cex$a
skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V a
net/minecraft/tileentity/TileEntitySkull awd
net/minecraft/util/ResourceLocation nf
net/minecraft/util/Session bii
getProfile ()Lcom/mojang/authlib/GameProfile; e
net/minecraft/util/StringUtils rp
stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a
-3
View File
@@ -10,7 +10,6 @@ net/minecraft/client/Minecraft djz
getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; E
getMinecraft ()Lnet/minecraft/client/Minecraft; C
getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; N
getSession ()Lnet/minecraft/util/Session; J
getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; Y
getSkinManager ()Lnet/minecraft/client/resources/SkinManager; Z
getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; M
@@ -56,7 +55,5 @@ net/minecraft/client/resources/SkinManager$SkinAvailableCallback eks$a
skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable
net/minecraft/tileentity/TileEntitySkull cdg
net/minecraft/util/ResourceLocation vk
net/minecraft/util/Session dkm
getProfile ()Lcom/mojang/authlib/GameProfile; e
net/minecraft/util/StringUtils aft
stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a
@@ -4,32 +4,31 @@ customskinloader/fake/itf/IFakeTextureManager_1 customskinloader/fake/itf/IFakeT
getTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)Lnet/minecraft/client/renderer/texture/Texture; b
customskinloader/fake/itf/IFakeTextureManager_2 customskinloader/fake/itf/IFakeTextureManager_2
func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)V a
net/minecraft/client/Minecraft dvo
net/minecraft/client/Minecraft dvp
gameDir o
addScheduledTask (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; func_152344_a
getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; E
getMinecraft ()Lnet/minecraft/client/Minecraft; C
getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; N
getSession ()Lnet/minecraft/util/Session; J
getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; Y
getSkinManager ()Lnet/minecraft/client/resources/SkinManager; Z
getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; M
net/minecraft/client/gui/GuiPlayerTabOverlay dxo
net/minecraft/client/gui/spectator/PlayerMenuObject eem
net/minecraft/client/multiplayer/ServerData ejm
net/minecraft/client/gui/GuiPlayerTabOverlay dxp
net/minecraft/client/gui/spectator/PlayerMenuObject een
net/minecraft/client/multiplayer/ServerData ejn
serverIP b
net/minecraft/client/renderer/RenderType enp
net/minecraft/client/renderer/RenderType enq
func_228644_e_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; h
net/minecraft/client/renderer/IImageBuffer net/minecraft/client/renderer/IImageBuffer
func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; func_195786_a
parseUserSkin (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; func_78432_a
skinAvailable ()V func_152634_a
net/minecraft/client/renderer/ThreadDownloadImageData exc
net/minecraft/client/renderer/entity/RenderPlayer ews
net/minecraft/client/renderer/entity/layers/LayerCape evb
net/minecraft/client/renderer/texture/DownloadingTexture exc
net/minecraft/client/renderer/ThreadDownloadImageData exd
net/minecraft/client/renderer/entity/RenderPlayer ewt
net/minecraft/client/renderer/entity/layers/LayerCape evc
net/minecraft/client/renderer/texture/DownloadingTexture exd
net/minecraft/client/renderer/texture/ITextureObject net/minecraft/client/renderer/texture/ITextureObject
net/minecraft/client/renderer/texture/NativeImage dpl
net/minecraft/client/renderer/texture/NativeImage dpm
func_195699_a (IIIIIIZZ)V a
func_195700_a (III)V a
func_195702_a ()I a
@@ -37,26 +36,24 @@ net/minecraft/client/renderer/texture/NativeImage dpl
func_195709_a (II)I a
func_195714_b ()I b
func_195715_a (IIIII)V a
net/minecraft/client/renderer/texture/SimpleTexture exh
net/minecraft/client/renderer/texture/Texture ewz
net/minecraft/client/renderer/texture/TextureManager exm
net/minecraft/client/renderer/texture/SimpleTexture exi
net/minecraft/client/renderer/texture/Texture exa
net/minecraft/client/renderer/texture/TextureManager exn
getTexture (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; func_110581_b
loadTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z func_110579_a
net/minecraft/client/renderer/texture/ThreadDownloadImageData exc
net/minecraft/client/resources/DefaultPlayerSkin exs
net/minecraft/client/renderer/texture/ThreadDownloadImageData exd
net/minecraft/client/resources/DefaultPlayerSkin ext
getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a
getDefaultSkinLegacy ()Lnet/minecraft/util/ResourceLocation; a
net/minecraft/client/resources/IResource ads
getInputStream ()Ljava/io/InputStream; b
net/minecraft/client/resources/IResourceManager adt
getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; a
net/minecraft/client/resources/SkinManager eyb
net/minecraft/client/resources/SkinManager eyc
loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a
net/minecraft/client/resources/SkinManager$SkinAvailableCallback eyb$a
net/minecraft/client/resources/SkinManager$SkinAvailableCallback eyc$a
skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable
net/minecraft/tileentity/TileEntitySkull cjq
net/minecraft/tileentity/TileEntitySkull cjr
net/minecraft/util/ResourceLocation ww
net/minecraft/util/Session dwc
getProfile ()Lcom/mojang/authlib/GameProfile; e
net/minecraft/util/StringUtils ahi
net/minecraft/util/StringUtils ahj
stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a
@@ -1,7 +1,7 @@
minecraft_version=1.17
minecraft_full_versions=1.17
minecraft_version=1.17.1
minecraft_full_versions=1.17.1
#forge gradle needs forge version
forge_mc_version=1.12.2
forge_version=14.23.5.2768
mappings_version=stable_39
srg_notch_map=1.17.tsrg
srg_notch_map=1.17.1.tsrg
@@ -1,37 +1,37 @@
com/mojang/blaze3d/matrix/MatrixStack dqk
net/minecraft/client/Minecraft dvo
com/mojang/blaze3d/matrix/MatrixStack dql
net/minecraft/client/Minecraft dvp
isIntegratedServerRunning ()Z F
net/minecraft/client/entity/AbstractClientPlayer emi
net/minecraft/client/entity/AbstractClientPlayer emj
getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; a
getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; d
net/minecraft/client/gui/GuiPlayerTabOverlay dxo
net/minecraft/client/gui/GuiPlayerTabOverlay dxp
renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V func_175249_a
renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V a
net/minecraft/client/model/ModelRenderer eiq
net/minecraft/client/renderer/IRenderTypeBuffer enh
net/minecraft/client/renderer/RenderType enp
net/minecraft/client/model/ModelRenderer eir
net/minecraft/client/renderer/IRenderTypeBuffer eni
net/minecraft/client/renderer/RenderType enq
getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; b
net/minecraft/client/renderer/ThreadDownloadImageData exc
net/minecraft/client/renderer/ThreadDownloadImageData exd
bufferedImage field_110560_d
textureUploaded o
processTask m
loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; a
processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; c
net/minecraft/client/renderer/entity/RenderPlayer ews
net/minecraft/client/renderer/entity/RenderPlayer ewt
renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V a
renderItem (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;Lnet/minecraft/client/entity/AbstractClientPlayer;Lnet/minecraft/client/model/ModelRenderer;Lnet/minecraft/client/model/ModelRenderer;)V func_229145_a_
net/minecraft/client/renderer/entity/layers/LayerCape evb
net/minecraft/client/renderer/entity/layers/LayerCape evc
doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFF)V a
doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFFF)V func_225628_a_
net/minecraft/client/renderer/texture/NativeImage dpl
net/minecraft/client/renderer/texture/TextureManager exm
net/minecraft/client/resources/SkinManager eyb
net/minecraft/client/renderer/texture/NativeImage dpm
net/minecraft/client/renderer/texture/TextureManager exn
net/minecraft/client/resources/SkinManager eyc
loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a
loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; a
loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; a
net/minecraft/client/resources/SkinManager$SkinAvailableCallback eyb$a
net/minecraft/client/resources/SkinManager$SkinAvailableCallback eyc$a
net/minecraft/scoreboard/ScoreObjective dnv
net/minecraft/scoreboard/Scoreboard dny
net/minecraft/tileentity/TileEntitySkull cjq
net/minecraft/tileentity/TileEntitySkull cjr
updateGameProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; func_174884_b
net/minecraft/util/ResourceLocation ww
-3
View File
@@ -10,7 +10,6 @@ net/minecraft/client/Minecraft ave
getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; D
getMinecraft ()Lnet/minecraft/client/Minecraft; A
getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; Q
getSession ()Lnet/minecraft/util/Session; L
getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; aa
getSkinManager ()Lnet/minecraft/client/resources/SkinManager; ab
getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; P
@@ -56,7 +55,5 @@ net/minecraft/client/resources/SkinManager$SkinAvailableCallback bnp$a
skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V a
net/minecraft/tileentity/TileEntitySkull alo
net/minecraft/util/ResourceLocation jy
net/minecraft/util/Session avm
getProfile ()Lcom/mojang/authlib/GameProfile; e
net/minecraft/util/StringUtils nx
stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a
+26
View File
@@ -0,0 +1,26 @@
dependencies {
provided "com.google.guava:guava:21.0"
}
jar {
// Mixin 0.8 requires Guava 21.0 but Minecraft 1.8.9 uses Guava 17.0
from configurations.provided.files.collect {
return zipTree(it).matching { filter ->
filter.include { e ->
matchInnerClass e.path as String,
"com/google/common/io/InsecureRecursiveDeleteException",
"com/google/common/io/MoreFiles",
"com/google/common/io/RecursiveDeleteOption"
}
}
}
}
tasks.signJar {
exclude "com/google/common/io/**"
}
static boolean matchInnerClass(String path, String... names) {
names.any { name -> path.equals(name + ".class") || (path.startsWith(name + '$') && path.endsWith(".class")) }
}
-49
View File
@@ -1,49 +0,0 @@
{
"arguments": {
"game": [
"--tweakClass",
"customskinloader.tweaker.Tweaker"
]
},
"id": "${mcVersion}-CSL-${modShortFullVersion}",
"inheritsFrom": "${mcVersion}",
"libraries": [
{
"downloads": {
"artifact": {
"path": "customskinloader/CustomSkinLoader_${mcVersion}/${modFullVersion}/CustomSkinLoader_${mcVersion}-${modFullVersion}.jar",
"sha1": "{SHA1}",
"size": -1,
"url": "https://csl.littleservice.cn/libraries/customskinloader/CustomSkinLoader_${mcVersion}/${modFullVersion}/CustomSkinLoader_${mcVersion}-${modFullVersion}.jar"
}
},
"name": "customskinloader:CustomSkinLoader_${mcVersion}:${modFullVersion}"
},
{
"downloads": {
"artifact": {
"path": "net/minecraft/launchwrapper/1.12/launchwrapper-1.12.jar",
"sha1": "111e7bea9c968cdb3d06ef4632bf7ff0824d0f36",
"size": 32999,
"url": "https://libraries.minecraft.net/net/minecraft/launchwrapper/1.12/launchwrapper-1.12.jar"
}
},
"name": "net.minecraft:launchwrapper:1.12"
},
{
"downloads": {
"artifact": {
"path": "org/spongepowered/mixin/0.7.11-SNAPSHOT/mixin-0.7.11-20180703.121122-1.jar",
"sha1": "7a670207bdb97db418118ad1e9bb42424ff3776d",
"size": 1017668,
"url": "https://repo.spongepowered.org/repository/maven-public/org/spongepowered/mixin/0.7.11-SNAPSHOT/mixin-0.7.11-20180703.121122-1.jar"
}
},
"name": "org.spongepowered:mixin:0.7.11-SNAPSHOT"
}
],
"mainClass": "net.minecraft.launchwrapper.Launch",
"releaseTime": "${releaseTime}",
"time": "${releaseTime}",
"type": "release"
}
+1 -1
View File
@@ -4,5 +4,5 @@ dependencies {
implementation project(':Common'), {
transitive = false
}
implementation 'org.spongepowered:mixin:0.8.2:thin'
implementation 'org.spongepowered:mixin:0.8.3:thin'
}
+15 -10
View File
@@ -16,23 +16,28 @@ projectImplementation project(':Common')
projectImplementation project(':Vanilla')
import java.security.MessageDigest
import groovy.json.JsonOutput
import groovy.json.JsonSlurper
task afterBuildForVanilla {
doLast {
def file0 = file("build/libs/${archivesBaseName}-${version}.jar")
//copyProfileJson
File f = project.file("build/resources/main/Profile.json")
String of = String.format("build/libs/%s-CSL-%s.json", config.minecraft_version, shortVersion)
File off = rootProject.file(of)
off.parentFile.mkdirs()
File profile = project.file("build/resources/main/Profile.json")
File target = rootProject.file(String.format("build/libs/%s-CSL-%s.json", config.minecraft_version, shortVersion))
target.parentFile.mkdirs()
def digest = MessageDigest.getInstance "SHA1"
digest.update file0.getBytes()
def sha1 = new BigInteger(1, digest.digest()).toString 16 padLeft 40, "0"
off.withWriter "UTF-8", { w ->
f.eachLine "UTF-8", { str ->
w << "${-> str.contains("{SHA1}") ? str.replace("{SHA1}", sha1) : (!(str =~ $/"size":\s*-1/$) ? str : str.replace("-1", file0.size().toString()))}\n"
new JsonSlurper().parse(profile, "UTF-8").with { p ->
p.libraries.find({ lib ->
lib.name.startsWith "customskinloader:CustomSkinLoader_"
}).downloads.artifact.with { artifact ->
artifact.sha1 = MessageDigest.getInstance "SHA1" with { digest ->
digest.update file0.bytes
new BigInteger(1, digest.digest()).toString 16 padLeft 40, "0"
}
artifact.size = file0.size()
}
target.write JsonOutput.prettyPrint(JsonOutput.toJson(p)), "UTF-8"
}
}
}
+31 -31
View File
@@ -14,8 +14,8 @@
"downloads": {
"artifact": {
"path": "customskinloader/CustomSkinLoader_${mcVersion}/${modFullVersion}/CustomSkinLoader_${mcVersion}-${modFullVersion}.jar",
"sha1": "{SHA1}",
"size": -1,
"sha1": "",
"size": 0,
"url": "https://csl.littleservice.cn/libraries/customskinloader/CustomSkinLoader_${mcVersion}/${modFullVersion}/CustomSkinLoader_${mcVersion}-${modFullVersion}.jar"
}
},
@@ -46,68 +46,68 @@
{
"downloads": {
"artifact": {
"path": "org/ow2/asm/asm/9.1/asm-9.1.jar",
"sha1": "a99500cf6eea30535eeac6be73899d048f8d12a8",
"size": 121790,
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.1/asm-9.1.jar"
"path": "org/ow2/asm/asm/9.2/asm-9.2.jar",
"sha1": "81a03f76019c67362299c40e0ba13405f5467bff",
"size": 122004,
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.2/asm-9.2.jar"
}
},
"name": "org.ow2.asm:asm:9.1"
"name": "org.ow2.asm:asm:9.2"
},
{
"downloads": {
"artifact": {
"path": "org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.jar",
"sha1": "4f61b83b81d8b659958f4bcc48907e93ecea55a0",
"path": "org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar",
"sha1": "7487dd756daf96cab9986e44b9d7bcb796a61c10",
"size": 34257,
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.1/asm-analysis-9.1.jar"
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/9.2/asm-analysis-9.2.jar"
}
},
"name": "org.ow2.asm:asm-analysis:9.1"
"name": "org.ow2.asm:asm-analysis:9.2"
},
{
"downloads": {
"artifact": {
"path": "org/ow2/asm/asm-commons/9.1/asm-commons-9.1.jar",
"sha1": "8b971b182eb5cf100b9e8d4119152d83e00e0fdd",
"size": 72641,
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.1/asm-commons-9.1.jar"
"path": "org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar",
"sha1": "f4d7f0fc9054386f2893b602454d48e07d4fbead",
"size": 72642,
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/9.2/asm-commons-9.2.jar"
}
},
"name": "org.ow2.asm:asm-commons:9.1"
"name": "org.ow2.asm:asm-commons:9.2"
},
{
"downloads": {
"artifact": {
"path": "org/ow2/asm/asm-tree/9.1/asm-tree-9.1.jar",
"sha1": "c333f2a855069cb8eb17a40a3eb8b1b67755d0eb",
"size": 52662,
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.1/asm-tree-9.1.jar"
"path": "org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar",
"sha1": "d96c99a30f5e1a19b0e609dbb19a44d8518ac01e",
"size": 52660,
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/9.2/asm-tree-9.2.jar"
}
},
"name": "org.ow2.asm:asm-tree:9.1"
"name": "org.ow2.asm:asm-tree:9.2"
},
{
"downloads": {
"artifact": {
"path": "org/ow2/asm/asm-util/9.1/asm-util-9.1.jar",
"sha1": "36464a45d871779f3383a8a9aba2b26562a86729",
"size": 84679,
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.1/asm-util-9.1.jar"
"path": "org/ow2/asm/asm-util/9.2/asm-util-9.2.jar",
"sha1": "fbc178fc5ba3dab50fd7e8a5317b8b647c8e8946",
"size": 84854,
"url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-util/9.2/asm-util-9.2.jar"
}
},
"name": "org.ow2.asm:asm-util:9.1"
"name": "org.ow2.asm:asm-util:9.2"
},
{
"downloads": {
"artifact": {
"path": "org/spongepowered/mixin/0.8.3-SNAPSHOT/mixin-0.8.3-20210427.123106-6.jar",
"sha1": "ac62dd93389087d7568d614146b37da0b1cdc642",
"size": 1006436,
"url": "https://repo.spongepowered.org/repository/maven-public/org/spongepowered/mixin/0.8.3-SNAPSHOT/mixin-0.8.3-20210427.123106-6.jar"
"path": "org/spongepowered/mixin/0.8.3/mixin-0.8.3.jar",
"sha1": "5b08b203d5c601e2393be5cf9b4d39c26d12eb5f",
"size": 1017052,
"url": "https://repo.spongepowered.org/repository/maven-public/org/spongepowered/mixin/0.8.3/mixin-0.8.3.jar"
}
},
"name": "org.spongepowered:mixin:0.8.3-SNAPSHOT"
"name": "org.spongepowered:mixin:0.8.3"
}
],
"mainClass": "net.minecraft.launchwrapper.Launch",
@@ -1,124 +0,0 @@
package customskinloader.tweaker;
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
import customskinloader.utils.JavaUtil;
import org.apache.commons.io.IOUtils;
import customskinloader.utils.MinecraftUtil;
import net.minecraft.launchwrapper.IClassTransformer;
public class ClassTransformer implements IClassTransformer {
private ZipFile zipFile = null;
private ArrayList<String> classes=new ArrayList<String>();
public ClassTransformer() {
ModSystemTweaker.logger.info("ClassTransformer Begin");
try {
URL urls[] = JavaUtil.getClasspath();
for (URL url : urls) {
if(MinecraftUtil.isCoreFile(url)){
ModSystemTweaker.logger.debug(url.toString()+" : SKIP (core file).");
continue;
}
if(MinecraftUtil.isLibraryFile(url)){
ModSystemTweaker.logger.debug(url.toString()+" : SKIP (library file).");
continue;
}
File file = new File(url.toURI());
if(!file.isFile()){
ModSystemTweaker.logger.info(url.toString()+" : EXCEPTION (file not found).");
continue;
}
ZipFile tempZipFile = getZipFile(file);
if(tempZipFile==null){
ModSystemTweaker.logger.info(url.toString()+" : EXCEPTION (^ Message ^).");
continue;
}
if (tempZipFile.getEntry("customskinloader/tweaker/ClassTransformer.class") == null){
tempZipFile.close();
ModSystemTweaker.logger.debug(url.toString()+" : FINISH (not target).");
continue;
}
zipFile = tempZipFile;
Enumeration<? extends ZipEntry> entries=zipFile.entries();
StringBuilder sb=new StringBuilder();
while(entries.hasMoreElements()){
ZipEntry entry=entries.nextElement();
String name=entry.getName();
if(name.endsWith(".class")&&(!name.contains("/")||name.startsWith("net"))){
classes.add(name);
sb.append(" ");
sb.append(name);
}
}
ModSystemTweaker.logger.info(url.toString()+" : CHOOSE.");
ModSystemTweaker.logger.info("Classes:" + sb.toString());
break;
}
} catch (Exception e) {
ModSystemTweaker.logger.warning(e);
}
if (zipFile == null) {
ModSystemTweaker.logger.info("Can not find JAR in the classpath.");
}
}
private static ZipFile getZipFile(File file)
{
ZipFile zipFile0;
try {
zipFile0 = new ZipFile(file);
return zipFile0;
} catch (Exception e) {
ModSystemTweaker.logger.warning(e);
}
return null;
}
public byte[] transform(String name, String transformedName, byte bytes[]) {
if (zipFile == null)
return bytes;
String fullName = (name.startsWith("net") ? name.replace('.', '/') : name) + ".class";//Notch(Run)/MCP(Dev) Class Name
if(!classes.contains(fullName)){//Check Name
if(name.equals(transformedName))
return bytes;
fullName = transformedName.replace('.', '/') + ".class";//MCP Class Name
if(!classes.contains(fullName))//check Again
return bytes;
}
ZipEntry ze = zipFile.getEntry(fullName);
if (ze == null)
return bytes;
byte diBytes[] = getClass(ze);
if (diBytes != null) {
ModSystemTweaker.logger.info("Class '" + name + "'("+transformedName+") transformed.");
return diBytes;
}
else
return bytes;
}
private byte[] getClass(ZipEntry ze) {
try {
InputStream is = zipFile.getInputStream(ze);
byte[] bytes = IOUtils.toByteArray(is);
if ((long)bytes.length == ze.getSize())
return bytes;
ModSystemTweaker.logger.info("Failed: " + ze.getName() + " " + bytes.length + " / " + ze.getSize());
} catch (IOException e) {
e.printStackTrace();
}
return null;
}
}
+1 -8
View File
@@ -119,7 +119,7 @@ subprojects {
apply plugin: 'org.spongepowered.mixin'
dependencies {
implementation 'org.spongepowered:mixin:0.8.2'
implementation 'org.spongepowered:mixin:0.8.3'
}
apply from: rootProject.file("BuildScripts/remap.gradle")
@@ -156,11 +156,6 @@ subprojects {
inputFile = jar.archivePath
outputFile = jar.archivePath
// To prevent modlauncher from checking signer information about Minecraft classes in CustomSkinLoader jar after forge-1.16.3-34.1.27.
if (project.name.toLowerCase().contains("forge")) {
exclude "net/minecraft/client/**"
}
keyStore = "${rootDir}/Common/CustomSkinLoader.jks"
alias = 'CustomSkinLoader'
storePass = System.getenv("KEY_PASS")
@@ -175,8 +170,6 @@ subprojects {
from "build/libs"
into "${rootDir}/build/libs"
include "**/*.jar"
exclude "**/*-srg.jar"
exclude "**/*-dev.jar"
if (project.name.toLowerCase().contains("vanilla")) {
exclude "**/*-sources.jar"
}
+1 -1
View File
@@ -8,7 +8,7 @@ include "Vanilla"
include "Vanilla/1.8.9"
include "Vanilla/1.12.2"
include "Vanilla/1.16.5"
include "Vanilla/1.17"
include "Vanilla/1.17.1"
//Universal Forge Edition for [1.8,)
include "Forge"