commit 62eee93fea1ab03ce33aba0154b9b299fc461cc8 Author: Gardel Date: Mon Sep 1 01:43:22 2025 +0800 feat: 1.20 port diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d5f737e --- /dev/null +++ b/.gitignore @@ -0,0 +1,119 @@ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Compiled class file +*.class + +# Log file +*.log + +# BlueJ files +*.ctxt + +# Package Files # +*.jar +*.war +*.nar +*.ear +*.zip +*.tar.gz +*.rar + +# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml +hs_err_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +.gradle +build/ + +# Ignore Gradle GUI config +gradle-app.setting + +# Cache of project +.gradletasknamecache + +**/build/ + +# Common working directory +run/ +runs/ + +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..b6cd800 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2025 Gardel + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..9c034dc --- /dev/null +++ b/build.gradle @@ -0,0 +1,70 @@ +plugins { + id 'dev.architectury.loom' version '1.11-SNAPSHOT' apply false + id 'architectury-plugin' version '3.4-SNAPSHOT' + id 'com.github.johnrengelman.shadow' version '8.1.1' apply false +} + +architectury { + minecraft = project.minecraft_version +} + +allprojects { + group = rootProject.maven_group + version = rootProject.mod_version +} + +subprojects { + apply plugin: 'dev.architectury.loom' + apply plugin: 'architectury-plugin' + apply plugin: 'maven-publish' + + base { + // Set up a suffixed format for the mod jar names, e.g. `example-fabric`. + archivesName = "$rootProject.archives_name-$project.name" + } + + repositories { + // Add repositories to retrieve artifacts from in here. + // You should only use this when depending on other mods because + // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. + // See https://docs.gradle.org/current/userguide/declaring_repositories.html + // for more information about repositories. + } + + dependencies { + minecraft "net.minecraft:minecraft:$rootProject.minecraft_version" + mappings loom.officialMojangMappings() + } + + java { + // Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task + // if it is present. + // If you remove this line, sources will not be generated. + withSourcesJar() + + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + + tasks.withType(JavaCompile).configureEach { + it.options.release = 17 + } + + // Configure Maven publishing. + publishing { + publications { + mavenJava(MavenPublication) { + artifactId = base.archivesName.get() + from components.java + } + } + + // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing. + repositories { + // Add repositories to publish to here. + // Notice: This block does NOT have the same function as the block in the top level. + // The repositories here will be used for publishing your artifact, not for + // retrieving dependencies. + } + } +} diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..9ef60cb --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,11 @@ +architectury { + common rootProject.enabled_platforms.split(',') +} + +dependencies { + // We depend on Fabric Loader here to use the Fabric @Environment annotations, + // which get remapped to the correct annotations on each platform. + // Do NOT use other classes from Fabric Loader. + modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" + compileOnly("com.mojang:authlib:4.0.43") +} diff --git a/common/src/main/java/net/magicterra/skinfix/SkinFixMod.java b/common/src/main/java/net/magicterra/skinfix/SkinFixMod.java new file mode 100644 index 0000000..cf48595 --- /dev/null +++ b/common/src/main/java/net/magicterra/skinfix/SkinFixMod.java @@ -0,0 +1,17 @@ +package net.magicterra.skinfix; + + +import com.mojang.logging.LogUtils; +import org.slf4j.Logger; + +public final class SkinFixMod { + public static final String MOD_ID = "skinfix"; + + public static final Logger LOGGER = LogUtils.getLogger(); + + public static final String TEXTURE_DOMAIN_SUFFIX = ".gardel.top"; + + public static void init() { + // Write common init code here. + } +} diff --git a/common/src/main/java/net/magicterra/skinfix/inject/InjectTextureUrlChecker.java b/common/src/main/java/net/magicterra/skinfix/inject/InjectTextureUrlChecker.java new file mode 100644 index 0000000..dc18a16 --- /dev/null +++ b/common/src/main/java/net/magicterra/skinfix/inject/InjectTextureUrlChecker.java @@ -0,0 +1,63 @@ +package net.magicterra.skinfix.inject; + +import java.net.IDN; +import java.net.URI; +import java.net.URISyntaxException; +import java.util.List; +import java.util.Locale; +import java.util.Set; +import net.magicterra.skinfix.SkinFixMod; + +public class InjectTextureUrlChecker { + private static final Set ALLOWED_SCHEMES = Set.of( + "http", + "https" + ); + + private static final List ALLOWED_DOMAINS = List.of( + ".minecraft.net", + ".mojang.com", + SkinFixMod.TEXTURE_DOMAIN_SUFFIX + ); + + private static final List BLOCKED_DOMAINS = List.of( + "bugs.mojang.com", + "education.minecraft.net", + "feedback.minecraft.net" + ); + + public static boolean isAllowedTextureDomain(final String url) { + final URI uri; + + try { + uri = new URI(url).normalize(); + } catch (final URISyntaxException ignored) { + return false; + } + + final String scheme = uri.getScheme(); + if (scheme == null || !ALLOWED_SCHEMES.contains(scheme)) { + return false; + } + + final String domain = uri.getHost(); + if (domain == null) { + return false; + } + final String decodedDomain = IDN.toUnicode(domain); + final String lowerCaseDomain = decodedDomain.toLowerCase(Locale.ROOT); + if (!lowerCaseDomain.equals(decodedDomain)) { + return false; + } + return isDomainOnList(decodedDomain, ALLOWED_DOMAINS) && !isDomainOnList(decodedDomain, BLOCKED_DOMAINS); + } + + private static boolean isDomainOnList(final String domain, final List list) { + for (final String entry : list) { + if (domain.endsWith(entry)) { + return true; + } + } + return false; + } +} diff --git a/common/src/main/java/net/magicterra/skinfix/inject/InjectYggdrasilAuthenticationService.java b/common/src/main/java/net/magicterra/skinfix/inject/InjectYggdrasilAuthenticationService.java new file mode 100644 index 0000000..4f9bdf6 --- /dev/null +++ b/common/src/main/java/net/magicterra/skinfix/inject/InjectYggdrasilAuthenticationService.java @@ -0,0 +1,73 @@ +package net.magicterra.skinfix.inject; + +import com.mojang.authlib.Environment; +import com.mojang.authlib.EnvironmentParser; +import com.mojang.authlib.GameProfileRepository; +import com.mojang.authlib.HttpAuthenticationService; +import com.mojang.authlib.exceptions.AuthenticationException; +import com.mojang.authlib.minecraft.MinecraftSessionService; +import com.mojang.authlib.minecraft.UserApiService; +import com.mojang.authlib.yggdrasil.ServicesKeySet; +import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import com.mojang.authlib.yggdrasil.YggdrasilEnvironment; +import com.mojang.authlib.yggdrasil.YggdrasilGameProfileRepository; +import com.mojang.authlib.yggdrasil.YggdrasilServicesKeyInfo; +import com.mojang.authlib.yggdrasil.YggdrasilUserApiService; +import java.net.Proxy; +import java.net.URL; + +/** + * InjectYggdrasilAuthenticationService + * + * @author Gardel <gardel741@outlook.com> + * @since 2025-04-26 22:10 + */ +public class InjectYggdrasilAuthenticationService extends YggdrasilAuthenticationService { + private final ServicesKeySet servicesKeySet; + + private final Environment environment; + + public InjectYggdrasilAuthenticationService(Proxy proxy) { + this(proxy, EnvironmentParser + .getEnvironmentFromProperties() + .orElse(YggdrasilEnvironment.PROD.getEnvironment())); + } + + public InjectYggdrasilAuthenticationService(Proxy proxy, Environment environment) { + super(proxy, environment); + this.environment = environment; + + final URL publicKeySetUrl = HttpAuthenticationService.constantURL("https://mc.gardel.top/minecraftservices/publickeys"); + this.servicesKeySet = YggdrasilServicesKeyInfo.get(publicKeySetUrl, this); + } + + @Override + public MinecraftSessionService createMinecraftSessionService() { + return new InjectYggdrasilMinecraftSessionService(this, environment); + } + + @Override + public ServicesKeySet getServicesKeySet() { + return servicesKeySet; + } + + @Override + public GameProfileRepository createProfileRepository() { + return new YggdrasilGameProfileRepository(this, Environment.create( + environment.getAuthHost(), + "https://mc.gardel.top/api", + environment.getSessionHost(), + environment.getServicesHost(), + environment.getName())); + } + + @Override + public UserApiService createUserApiService(String accessToken) throws AuthenticationException { + return new YggdrasilUserApiService(accessToken, getProxy(), Environment.create( + environment.getAuthHost(), + environment.getAccountsHost(), + environment.getSessionHost(), + "https://mc.gardel.top/minecraftservices", + environment.getName())); + } +} diff --git a/common/src/main/java/net/magicterra/skinfix/inject/InjectYggdrasilMinecraftSessionService.java b/common/src/main/java/net/magicterra/skinfix/inject/InjectYggdrasilMinecraftSessionService.java new file mode 100644 index 0000000..97a7ced --- /dev/null +++ b/common/src/main/java/net/magicterra/skinfix/inject/InjectYggdrasilMinecraftSessionService.java @@ -0,0 +1,95 @@ +package net.magicterra.skinfix.inject; + +import com.google.common.collect.Iterables; +import com.google.gson.Gson; +import com.google.gson.JsonParseException; +import com.mojang.authlib.Environment; +import com.mojang.authlib.GameProfile; +import com.mojang.authlib.minecraft.InsecurePublicKeyException; +import com.mojang.authlib.minecraft.MinecraftProfileTexture; +import com.mojang.authlib.properties.Property; +import com.mojang.authlib.yggdrasil.ServicesKeySet; +import com.mojang.authlib.yggdrasil.ServicesKeyType; +import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import com.mojang.authlib.yggdrasil.YggdrasilMinecraftSessionService; +import com.mojang.authlib.yggdrasil.response.MinecraftTexturesPayload; +import java.lang.reflect.Field; +import java.nio.charset.StandardCharsets; +import java.util.Base64; +import java.util.HashMap; +import java.util.Map; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * InjectYggdrasilMinecraftSessionService + * + * @author Gardel <gardel741@outlook.com> + * @since 2025-04-26 22:11 + */ +public class InjectYggdrasilMinecraftSessionService extends YggdrasilMinecraftSessionService { + private static final Logger LOGGER = LoggerFactory.getLogger(InjectYggdrasilMinecraftSessionService.class); + + private final Gson gson; + + protected InjectYggdrasilMinecraftSessionService(YggdrasilAuthenticationService service, Environment env) { + super(service, env); + try { + Field field = YggdrasilMinecraftSessionService.class.getDeclaredField("gson"); + field.setAccessible(true); + gson = (Gson) field.get(this); + } catch (NoSuchFieldException | IllegalAccessException e) { + throw new IllegalStateException(e); + } + } + + @Override + public Map getTextures(GameProfile profile, boolean requireSecure) throws InsecurePublicKeyException { + final Property textureProperty = Iterables.getFirst(profile.getProperties().get("textures"), null); + + if (textureProperty == null) { + return new HashMap<>(); + } + + final String value = requireSecure ? getSecurePropertyValue(textureProperty) : textureProperty.getValue(); + + final MinecraftTexturesPayload result; + try { + final String json = new String(Base64.getDecoder().decode(value), StandardCharsets.UTF_8); + result = gson.fromJson(json, MinecraftTexturesPayload.class); + } catch (final JsonParseException e) { + LOGGER.error("Could not decode textures payload", e); + return new HashMap<>(); + } + + if (result == null || result.getTextures() == null) { + return new HashMap<>(); + } + + for (final Map.Entry entry : result.getTextures().entrySet()) { + final String url = entry.getValue().getUrl(); + if (!InjectTextureUrlChecker.isAllowedTextureDomain(url)) { + LOGGER.error("Textures payload contains blocked domain: {}", url); + return new HashMap<>(); + } + } + + return result.getTextures(); + } + + @Override + public String getSecurePropertyValue(final Property property) throws InsecurePublicKeyException { + if (!property.hasSignature()) { + LOGGER.error("Signature is missing from Property {}", property.getName()); + throw new InsecurePublicKeyException.MissingException(); + } + + final ServicesKeySet servicesKeySet = getAuthenticationService().getServicesKeySet(); + if (servicesKeySet.keys(ServicesKeyType.PROFILE_PROPERTY).stream().noneMatch(key -> key.validateProperty(property))) { + LOGGER.error("Property {} has been tampered with (signature invalid)", property.getName()); + throw new InsecurePublicKeyException.InvalidException("Property has been tampered with (signature invalid)"); + } + + return property.getValue(); + } +} diff --git a/common/src/main/java/net/magicterra/skinfix/mixin/MinecraftMixin.java b/common/src/main/java/net/magicterra/skinfix/mixin/MinecraftMixin.java new file mode 100644 index 0000000..04ad540 --- /dev/null +++ b/common/src/main/java/net/magicterra/skinfix/mixin/MinecraftMixin.java @@ -0,0 +1,34 @@ +package net.magicterra.skinfix.mixin; + +import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; +import java.net.Proxy; +import net.magicterra.skinfix.inject.InjectYggdrasilAuthenticationService; +import net.minecraft.client.Minecraft; +import org.slf4j.Logger; +import org.spongepowered.asm.mixin.Final; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Shadow; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +/** + * MinecraftMixin + * + * @author Gardel <gardel741@outlook.com> + * @since 2025-04-26 19:03 + */ +@Mixin(Minecraft.class) +public abstract class MinecraftMixin { + @Final + @Shadow + private static Logger LOGGER; + + @Redirect( + method = "", + at = @At(value = "NEW", target = "(Ljava/net/Proxy;)Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;", remap = false) + ) + public YggdrasilAuthenticationService getCustomYggdrasilAuthenticationService(Proxy proxy) { + LOGGER.info("injecting custom Yggdrasil authentication service"); + return new InjectYggdrasilAuthenticationService(proxy); + } +} diff --git a/common/src/main/java/net/magicterra/skinfix/mixin/ProfilePublicKeyDataMixin.java b/common/src/main/java/net/magicterra/skinfix/mixin/ProfilePublicKeyDataMixin.java new file mode 100644 index 0000000..43c579e --- /dev/null +++ b/common/src/main/java/net/magicterra/skinfix/mixin/ProfilePublicKeyDataMixin.java @@ -0,0 +1,25 @@ +package net.magicterra.skinfix.mixin; + +import java.util.UUID; +import net.minecraft.util.SignatureValidator; +import net.minecraft.world.entity.player.ProfilePublicKey; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.Overwrite; + +/** + * 跳过 ProfileKey 校验 + * + * @author Gardel <gardel741@outlook.com> + * @since 2025-06-06 02:54 + */ +@Mixin(ProfilePublicKey.Data.class) +public abstract class ProfilePublicKeyDataMixin { + /** + * @author Gardel + * @reason skip verify + */ + @Overwrite + boolean validateSignature(SignatureValidator signatureValidator, UUID profileId) { + return true; + } +} diff --git a/common/src/main/resources/assets/skinfix/icon.png b/common/src/main/resources/assets/skinfix/icon.png new file mode 100644 index 0000000..886ff4e Binary files /dev/null and b/common/src/main/resources/assets/skinfix/icon.png differ diff --git a/common/src/main/resources/skinfix.mixins.json b/common/src/main/resources/skinfix.mixins.json new file mode 100644 index 0000000..222326b --- /dev/null +++ b/common/src/main/resources/skinfix.mixins.json @@ -0,0 +1,15 @@ +{ + "required": true, + "package": "net.magicterra.skinfix.mixin", + "compatibilityLevel": "JAVA_17", + "minVersion": "0.8", + "client": [ + "MinecraftMixin" + ], + "mixins": [ + "ProfilePublicKeyDataMixin" + ], + "injectors": { + "defaultRequire": 1 + } +} diff --git a/fabric/build.gradle b/fabric/build.gradle new file mode 100644 index 0000000..23c5f76 --- /dev/null +++ b/fabric/build.gradle @@ -0,0 +1,50 @@ +plugins { + id 'com.github.johnrengelman.shadow' +} + +architectury { + platformSetupLoomIde() + fabric() +} + +configurations { + common { + canBeResolved = true + canBeConsumed = false + } + compileClasspath.extendsFrom common + runtimeClasspath.extendsFrom common + developmentFabric.extendsFrom common + + // Files in this configuration will be bundled into your mod using the Shadow plugin. + // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files. + shadowBundle { + canBeResolved = true + canBeConsumed = false + } +} + +dependencies { + modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version" + + + common(project(path: ':common', configuration: 'namedElements')) { transitive false } + shadowBundle project(path: ':common', configuration: 'transformProductionFabric') +} + +processResources { + inputs.property 'version', project.version + + filesMatching('fabric.mod.json') { + expand version: project.version + } +} + +shadowJar { + configurations = [project.configurations.shadowBundle] + archiveClassifier = 'dev-shadow' +} + +remapJar { + input.set shadowJar.archiveFile +} diff --git a/fabric/src/main/java/net/magicterra/skinfix/fabric/SkinFixModFabric.java b/fabric/src/main/java/net/magicterra/skinfix/fabric/SkinFixModFabric.java new file mode 100644 index 0000000..b585b2b --- /dev/null +++ b/fabric/src/main/java/net/magicterra/skinfix/fabric/SkinFixModFabric.java @@ -0,0 +1,16 @@ +package net.magicterra.skinfix.fabric; + +import net.magicterra.skinfix.SkinFixMod; +import net.fabricmc.api.ModInitializer; + +public final class SkinFixModFabric implements ModInitializer { + @Override + public void onInitialize() { + // This code runs as soon as Minecraft is in a mod-load-ready state. + // However, some things (like resources) may still be uninitialized. + // Proceed with mild caution. + + // Run our common setup. + SkinFixMod.init(); + } +} diff --git a/fabric/src/main/java/net/magicterra/skinfix/fabric/client/SkinFixModFabricClient.java b/fabric/src/main/java/net/magicterra/skinfix/fabric/client/SkinFixModFabricClient.java new file mode 100644 index 0000000..44cfcd3 --- /dev/null +++ b/fabric/src/main/java/net/magicterra/skinfix/fabric/client/SkinFixModFabricClient.java @@ -0,0 +1,10 @@ +package net.magicterra.skinfix.fabric.client; + +import net.fabricmc.api.ClientModInitializer; + +public final class SkinFixModFabricClient implements ClientModInitializer { + @Override + public void onInitializeClient() { + // This entrypoint is suitable for setting up client-specific logic, such as rendering. + } +} diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json new file mode 100644 index 0000000..74944d0 --- /dev/null +++ b/fabric/src/main/resources/fabric.mod.json @@ -0,0 +1,35 @@ +{ + "schemaVersion": 1, + "id": "skinfix", + "version": "${version}", + "name": "SkinFix", + "description": "Fix Minecraft does not load skin png not prefix with minecraft.net", + "authors": [ + "Gardel" + ], + "contact": { + "homepage": "magicterra.net" + }, + "license": "MIT", + "icon": "assets/skinfix/icon.png", + "environment": "*", + "entrypoints": { + "main": [ + "net.magicterra.skinfix.fabric.SkinFixModFabric" + ], + "client": [ + "net.magicterra.skinfix.fabric.client.SkinFixModFabricClient" + ] + }, + "mixins": [ + "skinfix.mixins.json" + ], + "depends": { + "fabricloader": ">=0.17.2", + "minecraft": "~1.20.1", + "java": ">=17" + }, + "suggests": { + "another-mod": "*" + } +} diff --git a/forge/build.gradle b/forge/build.gradle new file mode 100644 index 0000000..7f1ea34 --- /dev/null +++ b/forge/build.gradle @@ -0,0 +1,56 @@ +plugins { + id 'com.github.johnrengelman.shadow' +} + +loom { + forge { + mixinConfig "skinfix.mixins.json" + } +} + +architectury { + platformSetupLoomIde() + forge() +} + +configurations { + common { + canBeResolved = true + canBeConsumed = false + } + compileClasspath.extendsFrom common + runtimeClasspath.extendsFrom common + developmentForge.extendsFrom common + + // Files in this configuration will be bundled into your mod using the Shadow plugin. + // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files. + shadowBundle { + canBeResolved = true + canBeConsumed = false + } +} + +dependencies { + forge "net.minecraftforge:forge:$rootProject.forge_version" + + + common(project(path: ':common', configuration: 'namedElements')) { transitive false } + shadowBundle project(path: ':common', configuration: 'transformProductionForge') +} + +processResources { + inputs.property 'version', project.version + + filesMatching('META-INF/mods.toml') { + expand version: project.version + } +} + +shadowJar { + configurations = [project.configurations.shadowBundle] + archiveClassifier = 'dev-shadow' +} + +remapJar { + input.set shadowJar.archiveFile +} diff --git a/forge/gradle.properties b/forge/gradle.properties new file mode 100644 index 0000000..8242585 --- /dev/null +++ b/forge/gradle.properties @@ -0,0 +1 @@ +loom.platform=forge diff --git a/forge/src/main/java/net/magicterra/skinfix/forge/SkinFixModForge.java b/forge/src/main/java/net/magicterra/skinfix/forge/SkinFixModForge.java new file mode 100644 index 0000000..8673c3e --- /dev/null +++ b/forge/src/main/java/net/magicterra/skinfix/forge/SkinFixModForge.java @@ -0,0 +1,12 @@ +package net.magicterra.skinfix.forge; + +import net.magicterra.skinfix.SkinFixMod; +import net.minecraftforge.fml.common.Mod; + +@Mod(SkinFixMod.MOD_ID) +public final class SkinFixModForge { + public SkinFixModForge() { + // Run our common setup. + SkinFixMod.init(); + } +} diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml new file mode 100644 index 0000000..cc2e4c9 --- /dev/null +++ b/forge/src/main/resources/META-INF/mods.toml @@ -0,0 +1,29 @@ +modLoader = "javafml" +loaderVersion = "[47,)" +#issueTrackerURL = "" +license = "MIT" + +[[mods]] +modId = "skinfix" +version = "${version}" +displayName = "SkinFix" +authors = "Gardel" +description = ''' +Fix Minecraft does not load skin png not prefix with minecraft.net +''' +logoFile="assets/skinfix/icon.png" + +[[dependencies.skinfix]] +modId = "forge" +mandatory = true +versionRange = "[47,)" +ordering = "NONE" +side = "BOTH" + +[[dependencies.skinfix]] +modId = "minecraft" +mandatory = true +versionRange = "[1.20.1,)" +ordering = "NONE" +side = "BOTH" + diff --git a/forge/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta new file mode 100644 index 0000000..cd937d8 --- /dev/null +++ b/forge/src/main/resources/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "description": "skinfix resources", + "pack_format": 15 + } +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..468efc0 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,13 @@ +# Done to increase the memory available to Gradle. +org.gradle.jvmargs=-Xmx2G +org.gradle.parallel=true +# Mod properties +mod_version=1.0-SNAPSHOT +maven_group=net.magicterra +archives_name=skinfix +enabled_platforms=fabric,forge +# Minecraft properties +minecraft_version=1.20.1 +# Dependencies +fabric_loader_version=0.17.2 +forge_version=1.20.1-47.4.6 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..e18bc25 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..f3b75f3 --- /dev/null +++ b/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..d5d91cf --- /dev/null +++ b/settings.gradle @@ -0,0 +1,14 @@ +pluginManagement { + repositories { + maven { url "https://maven.fabricmc.net/" } + maven { url "https://maven.architectury.dev/" } + maven { url "https://files.minecraftforge.net/maven/" } + gradlePluginPortal() + } +} + +rootProject.name = 'skinfix' + +include 'common' +include 'fabric' +include 'forge'