Remove: all vanilla editions

This commit is contained in:
ZekerZhayard committed 2023-01-29 22:52:21 +08:00
1 parent c2dad72690
commit 755f7647ed
136 files changed
+113 -1355

No files matched your search

@@ -16,6 +16,7 @@ import com.mojang.authlib.minecraft.MinecraftSessionService;
import customskinloader.CustomSkinLoader;
import customskinloader.utils.HttpTextureUtil;
import customskinloader.utils.MinecraftUtil;
import net.minecraft.client.renderer.texture.NativeImage;
import net.minecraft.client.renderer.IImageBuffer;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.SkinManager;
@@ -152,7 +153,7 @@ public class FakeSkinManager {
this.texture = texture;
}
public net.minecraft.client.renderer.texture.NativeImage func_195786_a(net.minecraft.client.renderer.texture.NativeImage image) {
public NativeImage func_195786_a(NativeImage image) {
return buffer instanceof FakeSkinBuffer ? ((FakeSkinBuffer) buffer).func_195786_a(image) : image;
}
@@ -4,7 +4,7 @@ import java.io.InputStream;
import net.minecraft.client.resources.IResource;
/** {@link net.minecraft.client.resources.IResource} is no longer an interface since 22w14a */
/** {@link IResource} is no longer an interface since 22w14a */
public interface IFakeIResource {
// 1.13.2 ~ 22w13a
interface V1 {
File renamed without changes.
File renamed without changes.
+16 -8
View File
@@ -1,16 +1,9 @@
jar {
exclude 'customskinloader/tweaker/**'
exclude 'net/minecraft/client/renderer/RenderType.class'
exclude 'net/minecraft/client/renderer/texture/**'
exclude 'net/minecraft/client/resources/**'
exclude 'net/minecraft/resources/**'
exclude 'Profile.json'
}
sourceJar {
exclude 'customskinloader/tweaker/**'
exclude 'net/**'
exclude 'Profile.json'
}
repositories {
@@ -18,6 +11,10 @@ repositories {
name = "fabric"
url = "https://maven.fabricmc.net/"
}
maven {
name = "sponge"
url = "https://repo.spongepowered.org/repository/maven-public/"
}
}
dependencies {
@@ -29,7 +26,18 @@ import customskinloader.gradle.util.RemapUtil
import customskinloader.gradle.util.SourceUtil
import groovy.json.JsonSlurper
SourceUtil.addDependencies project, project(":Common"), project(":Vanilla/Common")
apply plugin: 'org.spongepowered.mixin'
apply from: rootProject.file("buildSrc/patch.gradle")
patchMixin()
mixin {
add sourceSets.main, "mixins.customskinloader.refmap.json"
reobfSrgFile = "build/mixin.srg"
reobfNotchSrgFile = "build/mixin.srg"
}
SourceUtil.addDependencies project, project(":Common")
RemapUtil.remapSources project
// Resolve snapshot versions
@@ -55,13 +55,13 @@ public class MixinConfigPlugin implements IMixinConfigPlugin {
@Override
public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
boolean result = true;
if (mixinClassName.endsWith(".MixinThreadDownloadImageDataV2")) {
if (mixinClassName.endsWith(".MixinThreadDownloadImageData$V1")) {
result = (this.world_version >= 2205 && this.world_version <= 2722) && ((this.protocol_version >= 554 && this.protocol_version <= 754) || (this.protocol_version >= 801 && this.protocol_version <= 803) || (this.protocol_version >= 0x40000001 && this.protocol_version <= 0x40000022)); // 19w38a ~ 1.17-rc1
} else if (mixinClassName.endsWith(".MixinSkinManager$V2")) {
} else if (mixinClassName.endsWith(".MixinSkinManager$V1")) {
result = this.world_version >= 2205 && this.protocol_version >= 554; // 19w38a+
} else if (mixinClassName.endsWith(".MixinLayerCape") || mixinClassName.endsWith(".MixinRenderPlayer")) {
result = this.world_version >= 2210 && this.protocol_version >= 558; // 19w41a+
} else if (mixinClassName.endsWith(".MixinThreadDownloadImageDataV3")) {
} else if (mixinClassName.endsWith(".MixinThreadDownloadImageData$V2")) {
result = this.world_version >= 2723 && ((this.protocol_version >= 755 && this.protocol_version < 801) || (this.protocol_version > 803 && this.protocol_version < 0x40000001) || this.protocol_version >= 0x40000023); // 1.17-rc2+
}
logger.info("target: " + targetClassName + ", mixin: " + mixinClassName + ", result: " + result);
@@ -11,8 +11,6 @@ import com.mojang.authlib.GameProfile;
import com.mojang.authlib.minecraft.MinecraftProfileTexture;
import com.mojang.authlib.minecraft.MinecraftSessionService;
import customskinloader.fake.FakeSkinManager;
import net.minecraft.client.renderer.IImageBuffer;
import net.minecraft.client.renderer.ThreadDownloadImageData;
import net.minecraft.client.renderer.texture.TextureManager;
import net.minecraft.client.resources.SkinManager;
import net.minecraft.util.ResourceLocation;
@@ -29,6 +27,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
import org.spongepowered.asm.mixin.injection.invoke.arg.Args;
@Mixin(SkinManager.class)
@SuppressWarnings("target")
public abstract class MixinSkinManager {
private FakeSkinManager fakeManager;
@@ -161,25 +160,21 @@ public abstract class MixinSkinManager {
callbackInfoReturnable.setReturnValue(this.fakeManager.loadSkinFromCache(profile));
}
// 1.13+
@Mixin(SkinManager.class)
public abstract static class V1 {
@Redirect(
method = "Lnet/minecraft/client/resources/SkinManager;func_210275_a(Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V",
at = @At(
value = "INVOKE",
target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;getTextures(Lcom/mojang/authlib/GameProfile;Z)Ljava/util/Map;",
remap = false
)
@Redirect(
method = "Lnet/minecraft/client/resources/SkinManager;func_210275_a(Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V",
at = @At(
value = "INVOKE",
target = "Lcom/mojang/authlib/minecraft/MinecraftSessionService;getTextures(Lcom/mojang/authlib/GameProfile;Z)Ljava/util/Map;",
remap = false
)
private Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> redirect_func_210275_a(MinecraftSessionService sessionService, GameProfile profile, boolean requireSecure) {
return FakeSkinManager.getUserProfile(sessionService, profile, requireSecure);
}
)
private Map<MinecraftProfileTexture.Type, MinecraftProfileTexture> redirect_func_210275_a(MinecraftSessionService sessionService, GameProfile profile, boolean requireSecure) {
return FakeSkinManager.getUserProfile(sessionService, profile, requireSecure);
}
// 19w38a+
@Mixin(SkinManager.class)
public abstract static class V2 {
public abstract static class V1 {
@Redirect(
method = "Lnet/minecraft/client/resources/SkinManager;func_229297_b_(Ljava/util/Map;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V",
at = @At(
@@ -0,0 +1,57 @@
package customskinloader.mixin;
import customskinloader.fake.FakeSkinBuffer;
import net.minecraft.client.renderer.ThreadDownloadImageData;
import net.minecraft.client.renderer.texture.NativeImage;
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;
@SuppressWarnings("target")
public abstract class MixinThreadDownloadImageData {
@Mixin(ThreadDownloadImageData.class) // 19w38a ~ 1.17-rc1
public abstract static class V1 {
@Final
@Shadow
private Runnable processTask;
@Shadow
private static NativeImage processLegacySkin(NativeImage nativeImageIn) {
return null;
}
@Redirect(
method = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;loadTexture(Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage;",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;processLegacySkin(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;"
)
)
private NativeImage redirect_loadTexture(NativeImage image) {
return FakeSkinBuffer.processLegacySkin(image, this.processTask, MixinThreadDownloadImageData.V1::processLegacySkin);
}
}
@Mixin(ThreadDownloadImageData.class) // 1.17-rc2+
public abstract static class V2 {
@Final
@Shadow
private Runnable processTask;
@Shadow
abstract NativeImage processLegacySkin(NativeImage nativeImageIn);
@Redirect(
method = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;loadTexture(Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage;",
at = @At(
value = "INVOKE",
target = "Lnet/minecraft/client/renderer/ThreadDownloadImageData;processLegacySkin(Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage;"
)
)
private NativeImage redirect_loadTexture(ThreadDownloadImageData _this, NativeImage image) {
return FakeSkinBuffer.processLegacySkin(image, this.processTask, this::processLegacySkin);
}
}
}
File renamed without changes.
@@ -11,9 +11,8 @@
"MixinRenderPlayer",
"MixinSkinManager",
"MixinSkinManager$V1",
"MixinSkinManager$V2",
"MixinThreadDownloadImageDataV2",
"MixinThreadDownloadImageDataV3"
"MixinThreadDownloadImageData$V1",
"MixinThreadDownloadImageData$V2"
],
"refmap": "mixins.customskinloader.refmap.json",
"plugin": "customskinloader.fabric.MixinConfigPlugin",
-3
View File
@@ -6,10 +6,7 @@ jar {
])
}
exclude 'net/minecraft/client/renderer/RenderType.class'
exclude 'net/minecraft/client/renderer/texture/**'
exclude 'net/minecraft/client/resources/**'
exclude 'net/minecraft/resources/**'
}
sourceJar {
exclude 'com/**'
+3 -2
View File
@@ -6,10 +6,11 @@ jar {
"TweakOrder": -10
])
}
exclude 'net/minecraft/client/renderer/texture/**'
exclude 'net/minecraft/client/resources/IResource.class'
exclude 'net/minecraft/client/resources/IResourceManager.class'
exclude 'net/minecraft/client/resources/SkinManager.class'
exclude 'net/minecraft/client/resources/SkinManager$ISkinAvailableCallback.class'
exclude 'net/minecraft/resources/**'
}
sourceJar {
exclude 'net/**'
File renamed without changes.
-62
View File
@@ -1,62 +0,0 @@
customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1
func_199027_b ()Ljava/io/InputStream; b
customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2
open ()Ljava/io/InputStream; open
customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager
func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; a
getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; getResource
customskinloader/fake/itf/IFakeMinecraft customskinloader/fake/itf/IFakeMinecraft
func_195551_G ()Lnet/minecraft/resources/IResourceManager; O
net/minecraft/client/Minecraft bib
gameDir w
getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; C
getMinecraft ()Lnet/minecraft/client/Minecraft; z
getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; O
getSkinManager ()Lnet/minecraft/client/resources/SkinManager; Y
getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; N
net/minecraft/client/gui/GuiPlayerTabOverlay bjq
net/minecraft/client/gui/spectator/PlayerMenuObject boo
net/minecraft/client/multiplayer/ServerData bse
serverIP b
net/minecraft/client/renderer/RenderType net/minecraft/client/renderer/RenderType
func_228644_e_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; func_228644_e_
net/minecraft/client/renderer/IImageBuffer but
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; a
skinAvailable ()V a
net/minecraft/client/renderer/ThreadDownloadImageData cdh
net/minecraft/client/renderer/entity/RenderPlayer cct
net/minecraft/client/renderer/entity/layers/LayerCape cbr
net/minecraft/client/renderer/texture/ITextureObject cds
net/minecraft/client/renderer/texture/NativeImage com/mojang/blaze3d/platform/NativeImage
func_195699_a (IIIIIIZZ)V func_195699_a
func_195700_a (III)V func_195700_a
func_195702_a ()I func_195702_a
func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V func_195703_a
func_195709_a (II)I func_195709_a
func_195713_a (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; func_195713_a
func_195714_b ()I func_195714_b
func_195715_a (IIIII)V func_195715_a
net/minecraft/client/renderer/texture/SimpleTexture cdm
net/minecraft/client/renderer/texture/TextureManager cdr
getTexture (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; b
loadTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z a
net/minecraft/client/resources/DefaultPlayerSkin cef
getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a
net/minecraft/client/resources/IResource ceo
getInputStream ()Ljava/io/InputStream; b
net/minecraft/client/resources/IResourceManager cep
getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; a
net/minecraft/client/resources/SkinManager cex
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/util/ResourceLocation; a
net/minecraft/client/resources/SkinManager$3 cex$3
field_152801_c c
field_152802_d d
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/resources/IResource ceo
net/minecraft/resources/IResourceManager cep
net/minecraft/util/ResourceLocation nf
net/minecraft/util/StringUtils rp
stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a
-8
View File
@@ -1,8 +0,0 @@
minecraft_version=1.12.2
minecraft_full_versions=1.12.2
java_full_versions=8,9,10,11,12,13,14,15,16,17,18
#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.12.2.tsrg
-46
View File
@@ -1,46 +0,0 @@
com/mojang/blaze3d/matrix/MatrixStack com/mojang/blaze3d/matrix/MatrixStack
net/minecraft/client/Minecraft bib
isIntegratedServerRunning ()Z D
net/minecraft/client/entity/AbstractClientPlayer bua
getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; a
getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; e
net/minecraft/client/gui/GuiPlayerTabOverlay bjq
renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V a
renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V func_238523_a_
net/minecraft/client/gui/spectator/PlayerMenuObject boo
net/minecraft/client/model/ModelRenderer brs
net/minecraft/client/renderer/IImageBuffer but
net/minecraft/client/renderer/IRenderTypeBuffer net/minecraft/client/renderer/IRenderTypeBuffer
net/minecraft/client/renderer/RenderType net/minecraft/client/renderer/RenderType
getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; func_228634_a_
net/minecraft/client/renderer/ThreadDownloadImageData cdh
bufferedImage l
textureUploaded n
processTask field_229155_i_
loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; func_229159_a_
processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; func_229163_c_
net/minecraft/client/renderer/entity/RenderPlayer cct
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 func_229145_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 cbr
doRenderLayer (Lcom/mojang/blaze3d/matrix/MatrixStack;Lnet/minecraft/client/renderer/IRenderTypeBuffer;ILnet/minecraft/client/entity/AbstractClientPlayer;FFFFFF)V func_225628_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 net/minecraft/client/renderer/texture/NativeImage
net/minecraft/client/renderer/texture/TextureManager cdr
net/minecraft/client/resources/SkinManager cex
func_210275_a (Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V func_210275_a
func_229297_b_ (Ljava/util/Map;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V func_229297_b_
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$3 cex$3
run ()V run
net/minecraft/client/resources/SkinManager$3$1 cex$3$1
field_152803_a a
field_152804_b b
run ()V run
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/scoreboard/ScoreObjective bhg
net/minecraft/scoreboard/Scoreboard bhk
net/minecraft/util/ResourceLocation nf
Loaded 100 of 136 files, more files were not shown because too many files have changed in this diff. Show more