Support 1.19, Remove Vanilla 1.17.1 (#211)

This commit is contained in:
ZekerZhayard authored and GitHub committed 2022-06-09 10:00:10 +08:00
1 parent 8b641e0227
commit b2f8d2cc38
20 files changed
+100 -76

No files matched your search

@@ -14,7 +14,7 @@ import net.minecraft.util.ResourceLocation;
public class FakeInterfaceManager {
public static InputStream IResource_getInputStream(Object resource) {
return ((IFakeIResource) resource).func_199027_b();
return ((IFakeIResource.V2) resource).open();
}
public static Optional<IResource> IResourceManager_getResource(Object resourceManager, ResourceLocation location) throws IOException {
@@ -6,8 +6,17 @@ import net.minecraft.client.resources.IResource;
/** {@link net.minecraft.client.resources.IResource} is no longer an interface since 22w14a */
public interface IFakeIResource {
// 1.13.2+
default InputStream func_199027_b() {
return ((IResource) this).getInputStream();
// 1.13.2 ~ 22w13a
interface V1 {
default InputStream func_199027_b() {
return ((IResource) this).getInputStream();
}
}
// 22w14a+
interface V2 {
default InputStream open() {
return ((IFakeIResource.V1) this).func_199027_b();
}
}
}
+3 -1
View File
@@ -1,5 +1,7 @@
customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource
customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1
func_199027_b ()Ljava/io/InputStream; method_14482
customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2
open ()Ljava/io/InputStream; method_14482
customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager
func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; method_14486
getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; method_14486
+1 -1
View File
@@ -1,5 +1,5 @@
minecraft_version=1.14
minecraft_full_versions=1.14-Snapshot,1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15-Snapshot,1.15,1.15.1,1.15.2,1.16-Snapshot,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17-Snapshot,1.17,1.17.1,1.18-Snapshot,1.18,1.18.1,1.18.2,1.19-Snapshot
minecraft_full_versions=1.14-Snapshot,1.14,1.14.1,1.14.2,1.14.3,1.14.4,1.15-Snapshot,1.15,1.15.1,1.15.2,1.16-Snapshot,1.16,1.16.1,1.16.2,1.16.3,1.16.4,1.16.5,1.17-Snapshot,1.17,1.17.1,1.18-Snapshot,1.18,1.18.1,1.18.2,1.19-Snapshot,1.19
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
+4 -2
View File
@@ -1,8 +1,10 @@
customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource
customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1
func_199027_b ()Ljava/io/InputStream; m_6679_
customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2
open ()Ljava/io/InputStream; m_215507_
customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager
func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; m_142591_
getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; getResource
getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; m_213713_
customskinloader/fake/itf/IFakeMinecraft customskinloader/fake/itf/IFakeMinecraft
func_195551_G ()Lnet/minecraft/resources/IResourceManager; m_91098_
customskinloader/fake/itf/IFakeTextureManager$V1 customskinloader/fake/itf/IFakeTextureManager$V1
+1 -1
View File
@@ -1,5 +1,5 @@
minecraft_version=1.17.1
minecraft_full_versions=1.17.1,1.18,1.18.1,1.18.2
minecraft_full_versions=1.17.1,1.18,1.18.1,1.18.2,1.19
java_full_versions=16,17,18
#forge gradle needs forge version
forge_mc_version=1.12.2
+2 -1
View File
@@ -90,7 +90,8 @@ function initializeCoreMod() {
'name': 'net/minecraft/server/packs/resources/Resource'
},
'transformer': function (cn) {
cn.interfaces.add("customskinloader/fake/itf/IFakeIResource");
cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V1");
cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V2");
return cn;
}
},
+2 -1
View File
@@ -165,7 +165,8 @@ function initializeCoreMod() {
'name': 'net/minecraft/resources/IResource'
},
'transformer': function (cn) {
cn.interfaces.add("customskinloader/fake/itf/IFakeIResource");
cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V1");
cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V2");
cn.interfaces.add("net/minecraft/client/resources/IResource");
return cn;
}
@@ -88,7 +88,8 @@ public class FakeInterfacesTransformer {
public static class ClientIResourceTransformer implements TransformerManager.IClassTransformer {
@Override
public ClassNode transform(ClassNode cn) {
cn.interfaces.add("customskinloader/fake/itf/IFakeIResource");
cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V1");
cn.interfaces.add("customskinloader/fake/itf/IFakeIResource$V2");
cn.interfaces.add("net/minecraft/resources/IResource");
return cn;
}
+3 -1
View File
@@ -1,5 +1,7 @@
customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource
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
+3 -1
View File
@@ -1,5 +1,7 @@
customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource
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
+3 -1
View File
@@ -1,5 +1,7 @@
customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource
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; getResource
getResource (Lnet/minecraft/util/ResourceLocation;)Ljava/util/Optional; getResource
@@ -1,41 +1,43 @@
customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource
func_199027_b ()Ljava/io/InputStream; b
customskinloader/fake/itf/IFakeIResource$V1 customskinloader/fake/itf/IFakeIResource$V1
func_199027_b ()Ljava/io/InputStream; func_199027_b
customskinloader/fake/itf/IFakeIResource$V2 customskinloader/fake/itf/IFakeIResource$V2
open ()Ljava/io/InputStream; b
customskinloader/fake/itf/IFakeIResourceManager customskinloader/fake/itf/IFakeIResourceManager
func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; a
func_199002_a (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/resources/IResource; func_199002_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; N
func_195551_G ()Lnet/minecraft/resources/IResourceManager; Q
customskinloader/fake/itf/IFakeTextureManager$V1 customskinloader/fake/itf/IFakeTextureManager$V1
func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)Z func_229263_a_
func_229267_b_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/Texture; b
getTexture (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)Lnet/minecraft/client/renderer/texture/Texture; b
customskinloader/fake/itf/IFakeTextureManager$V2 customskinloader/fake/itf/IFakeTextureManager$V2
func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)V a
net/minecraft/client/Minecraft dvp
net/minecraft/client/Minecraft eev
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
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 dxp
net/minecraft/client/gui/spectator/PlayerMenuObject een
net/minecraft/client/multiplayer/ServerData ejn
getCurrentServerData ()Lnet/minecraft/client/multiplayer/ServerData; I
getMinecraft ()Lnet/minecraft/client/Minecraft; G
getResourceManager ()Lnet/minecraft/client/resources/IResourceManager; Q
getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; aa
getSkinManager ()Lnet/minecraft/client/resources/SkinManager; ab
getTextureManager ()Lnet/minecraft/client/renderer/texture/TextureManager; P
net/minecraft/client/gui/GuiPlayerTabOverlay ehi
net/minecraft/client/gui/spectator/PlayerMenuObject eon
net/minecraft/client/multiplayer/ServerData ets
serverIP b
net/minecraft/client/renderer/RenderType enq
net/minecraft/client/renderer/RenderType eyc
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 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/ThreadDownloadImageData fhx
net/minecraft/client/renderer/entity/RenderPlayer fhm
net/minecraft/client/renderer/entity/layers/LayerCape ffu
net/minecraft/client/renderer/texture/DownloadingTexture fhx
net/minecraft/client/renderer/texture/ITextureObject net/minecraft/client/renderer/texture/ITextureObject
net/minecraft/client/renderer/texture/NativeImage dpm
net/minecraft/client/renderer/texture/NativeImage dyt
func_195699_a (IIIIIIZZ)V a
func_195700_a (III)V a
func_195702_a ()I a
@@ -43,25 +45,25 @@ net/minecraft/client/renderer/texture/NativeImage dpm
func_195709_a (II)I a
func_195714_b ()I b
func_195715_a (IIIII)V a
net/minecraft/client/renderer/texture/SimpleTexture exi
net/minecraft/client/renderer/texture/Texture exa
net/minecraft/client/renderer/texture/TextureManager exn
net/minecraft/client/renderer/texture/SimpleTexture fic
net/minecraft/client/renderer/texture/Texture fhu
net/minecraft/client/renderer/texture/TextureManager fih
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 exd
net/minecraft/client/resources/DefaultPlayerSkin ext
net/minecraft/client/renderer/texture/ThreadDownloadImageData fhx
net/minecraft/client/resources/DefaultPlayerSkin fin
getDefaultSkin (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a
getDefaultSkinLegacy ()Lnet/minecraft/util/ResourceLocation; a
net/minecraft/client/resources/IResource ads
net/minecraft/client/resources/IResource ahs
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 eyc
net/minecraft/client/resources/IResourceManager ahu
getResource (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/resources/IResource; getResource
net/minecraft/client/resources/SkinManager fiw
loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a
net/minecraft/client/resources/SkinManager$SkinAvailableCallback eyc$a
net/minecraft/client/resources/SkinManager$SkinAvailableCallback fiw$a
skinAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable
net/minecraft/resources/IResource ads
net/minecraft/resources/IResourceManager adt
net/minecraft/util/ResourceLocation ww
net/minecraft/util/StringUtils ahj
net/minecraft/resources/IResource ahs
net/minecraft/resources/IResourceManager ahu
net/minecraft/util/ResourceLocation aaj
net/minecraft/util/StringUtils ame
stripControlCodes (Ljava/lang/String;)Ljava/lang/String; a
@@ -1,8 +1,8 @@
minecraft_version=1.17.1
minecraft_full_versions=1.17.1
minecraft_version=1.19
minecraft_full_versions=1.19
java_full_versions=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.17.1.tsrg
srg_notch_map=1.19.tsrg
@@ -1,35 +1,35 @@
com/mojang/blaze3d/matrix/MatrixStack dql
net/minecraft/client/Minecraft dvp
isIntegratedServerRunning ()Z F
net/minecraft/client/entity/AbstractClientPlayer emj
com/mojang/blaze3d/matrix/MatrixStack dzt
net/minecraft/client/Minecraft eev
isIntegratedServerRunning ()Z J
net/minecraft/client/entity/AbstractClientPlayer ewv
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 dxp
getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; c
net/minecraft/client/gui/GuiPlayerTabOverlay ehi
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 eir
net/minecraft/client/renderer/IRenderTypeBuffer eni
net/minecraft/client/renderer/RenderType enq
net/minecraft/client/model/ModelRenderer esv
net/minecraft/client/renderer/IRenderTypeBuffer exu
net/minecraft/client/renderer/RenderType eyc
getEntitySolid (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/RenderType; b
net/minecraft/client/renderer/ThreadDownloadImageData exd
net/minecraft/client/renderer/ThreadDownloadImageData fhx
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 ewt
net/minecraft/client/renderer/entity/RenderPlayer fhm
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 evc
net/minecraft/client/renderer/entity/layers/LayerCape ffu
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 dpm
net/minecraft/client/renderer/texture/TextureManager exn
net/minecraft/client/resources/SkinManager eyc
net/minecraft/client/renderer/texture/NativeImage dyt
net/minecraft/client/renderer/texture/TextureManager fih
net/minecraft/client/resources/SkinManager fiw
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 eyc$a
net/minecraft/scoreboard/ScoreObjective dnv
net/minecraft/scoreboard/Scoreboard dny
net/minecraft/util/ResourceLocation ww
net/minecraft/client/resources/SkinManager$SkinAvailableCallback fiw$a
net/minecraft/scoreboard/ScoreObjective dwo
net/minecraft/scoreboard/Scoreboard dwr
net/minecraft/util/ResourceLocation aaj
+3 -1
View File
@@ -1,5 +1,7 @@
customskinloader/fake/itf/IFakeIResource customskinloader/fake/itf/IFakeIResource
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
@@ -5,6 +5,6 @@ import net.minecraft.client.resources.IResource;
import org.spongepowered.asm.mixin.Mixin;
@Mixin(IResource.class)
public interface MixinIResource extends IFakeIResource {
public interface MixinIResource extends IFakeIResource.V1, IFakeIResource.V2 {
}
-2
View File
@@ -17,10 +17,8 @@ jar {
projectImplementation project(':Common')
projectImplementation project(':Vanilla/Common')
import groovy.json.JsonOutput
import groovy.json.JsonSlurper
import java.security.MessageDigest
task afterBuildForVanilla {
+1 -1
View File
@@ -9,8 +9,8 @@ include "Vanilla/Common"
include "Vanilla/1.8.9"
include "Vanilla/1.12.2"
include "Vanilla/1.16.5"
include "Vanilla/1.17.1"
include "Vanilla/1.18.2"
include "Vanilla/1.19"
//Forge Base Project
include "Forge/Common"