diff --git a/.gitignore b/.gitignore index 8e68661..30b5738 100644 --- a/.gitignore +++ b/.gitignore @@ -4,11 +4,6 @@ # Mobile Tools for Java (J2ME) .mtj.tmp/ -# Package Files # -*.jar -*.war -*.ear - # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* diff --git a/1.14.4/.gitignore b/1.14.4/.gitignore deleted file mode 100644 index 2779e59..0000000 --- a/1.14.4/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/build/ -/src/main/ diff --git a/1.14.4/1.14.4.srg b/1.14.4/1.14.4.srg deleted file mode 100644 index feeddcf..0000000 --- a/1.14.4/1.14.4.srg +++ /dev/null @@ -1,497 +0,0 @@ -CL: net/minecraft/util/ResourceLocation qv -CL: net/minecraft/util/ResourceLocation$Serializer qv$a -CL: net/minecraft/util/StringUtils aae -CL: net/minecraft/client/renderer/texture/NativeImage cuj -CL: net/minecraft/client/renderer/texture/NativeImage$1 cuj$1 -CL: net/minecraft/client/renderer/texture/NativeImage$PixelFormat cuj$a -CL: net/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode cuj$b -CL: net/minecraft/client/renderer/texture/NativeImage$WriteCallback cuj$c -CL: net/minecraft/client/Minecraft cyc -CL: net/minecraft/client/Minecraft$1 cyc$1 -CL: net/minecraft/client/Minecraft$2 cyc$2 -CL: net/minecraft/client/multiplayer/ServerData dki -CL: net/minecraft/client/multiplayer/ServerData$ServerResourceMode dki$a -CL: net/minecraft/client/renderer/IImageBuffer dnd -CL: net/minecraft/client/renderer/ImageBufferDownload dni -CL: net/minecraft/client/renderer/ThreadDownloadImageData dws -CL: net/minecraft/client/renderer/ThreadDownloadImageData$1 dws$1 -CL: net/minecraft/client/renderer/texture/SimpleTexture dwx -CL: net/minecraft/client/renderer/texture/SimpleTexture$TextureData dwx$a -CL: net/minecraft/client/renderer/texture/TextureManager dxc -CL: net/minecraft/client/renderer/texture/ITextureObject dxd -CL: net/minecraft/client/resources/DefaultPlayerSkin dxl -CL: net/minecraft/client/resources/SkinManager dxt -CL: net/minecraft/client/resources/SkinManager$1 dxt$1 -CL: net/minecraft/client/resources/SkinManager$2 dxt$2 -CL: net/minecraft/client/resources/SkinManager$SkinAvailableCallback dxt$a -FD: net/minecraft/util/ResourceLocation/field_110626_a qv/a -FD: net/minecraft/util/ResourceLocation/field_110625_b qv/b -FD: net/minecraft/util/ResourceLocation/field_200118_c qv/c -FD: net/minecraft/util/StringUtils/field_76339_a aae/a -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/RGBA cuj$a/a -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/RGB cuj$a/b -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/LUMINANCE_ALPHA cuj$a/c -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/LUMINANCE cuj$a/d -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211659_e cuj$a/e -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211660_f cuj$a/f -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211661_g cuj$a/g -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211662_h cuj$a/h -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211663_i cuj$a/i -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211664_j cuj$a/j -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211665_k cuj$a/k -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211666_l cuj$a/l -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211667_m cuj$a/m -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211668_n cuj$a/n -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211669_o cuj$a/o -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211670_p cuj$a/p -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/field_211671_q cuj$a/q -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/$VALUES cuj$a/r -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode/RGBA cuj$b/a -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode/RGB cuj$b/b -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode/LUMINANCE_ALPHA cuj$b/c -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode/LUMINANCE cuj$b/d -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode/INTENSITY cuj$b/e -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode/field_211673_f cuj$b/f -FD: net/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode/$VALUES cuj$b/g -FD: net/minecraft/client/renderer/texture/NativeImage$WriteCallback/field_209268_a cuj$c/a -FD: net/minecraft/client/renderer/texture/NativeImage$WriteCallback/field_209269_b cuj$c/b -FD: net/minecraft/client/renderer/texture/NativeImage/field_209272_a cuj/a -FD: net/minecraft/client/renderer/texture/NativeImage/field_211680_b cuj/b -FD: net/minecraft/client/renderer/texture/NativeImage/field_195719_a cuj/c -FD: net/minecraft/client/renderer/texture/NativeImage/field_195720_b cuj/d -FD: net/minecraft/client/renderer/texture/NativeImage/field_195721_c cuj/e -FD: net/minecraft/client/renderer/texture/NativeImage/field_195722_d cuj/f -FD: net/minecraft/client/renderer/texture/NativeImage/field_195723_e cuj/g -FD: net/minecraft/client/Minecraft$1/field_74532_a cyc$1/a -FD: net/minecraft/client/Minecraft$2/field_210222_a cyc$2/a -FD: net/minecraft/client/Minecraft$2/field_210223_b cyc$2/b -FD: net/minecraft/client/Minecraft/field_71426_K cyc/A -FD: net/minecraft/client/Minecraft/field_175612_E cyc/E -FD: net/minecraft/client/Minecraft/field_147123_G cyc/F -FD: net/minecraft/client/Minecraft/field_223714_G cyc/G -FD: net/minecraft/client/Minecraft/field_211120_F cyc/H -FD: net/minecraft/client/Minecraft/field_130070_K cyc/I -FD: net/minecraft/client/Minecraft/field_181038_N cyc/J -FD: net/minecraft/client/Minecraft/field_195556_O cyc/K -FD: net/minecraft/client/Minecraft/field_71422_O cyc/L -FD: net/minecraft/client/Minecraft/field_71446_o cyc/M -FD: net/minecraft/client/Minecraft/field_71432_P cyc/N -FD: net/minecraft/client/Minecraft/field_184131_U cyc/O -FD: net/minecraft/client/Minecraft/field_195557_T cyc/P -FD: net/minecraft/client/Minecraft/field_71434_R cyc/Q -FD: net/minecraft/client/Minecraft/field_71433_S cyc/R -FD: net/minecraft/client/Minecraft/field_181541_X cyc/S -FD: net/minecraft/client/Minecraft/field_71428_T cyc/T -FD: net/minecraft/client/Minecraft/field_71427_U cyc/U -FD: net/minecraft/client/Minecraft/field_175616_W cyc/V -FD: net/minecraft/client/Minecraft/field_175621_X cyc/W -FD: net/minecraft/client/Minecraft/field_175620_Y cyc/X -FD: net/minecraft/client/Minecraft/field_193995_ae cyc/Y -FD: net/minecraft/client/Minecraft/field_71449_j cyc/Z -FD: net/minecraft/client/Minecraft/field_142025_a cyc/a -FD: net/minecraft/client/Minecraft/field_211502_b cyc/b -FD: net/minecraft/client/Minecraft/field_71464_q cyc/c -FD: net/minecraft/client/Minecraft/field_71444_a cyc/d -FD: net/minecraft/client/Minecraft/field_71442_b cyc/e -FD: net/minecraft/client/Minecraft/field_195558_d cyc/f -FD: net/minecraft/client/Minecraft/field_71441_e cyc/g -FD: net/minecraft/client/Minecraft/field_71438_f cyc/h -FD: net/minecraft/client/Minecraft/field_71439_g cyc/i -FD: net/minecraft/client/Minecraft/field_175622_Z cyc/j -FD: net/minecraft/client/Minecraft/field_147125_j cyc/k -FD: net/minecraft/client/Minecraft/field_71452_i cyc/l -FD: net/minecraft/client/Minecraft/field_71466_p cyc/m -FD: net/minecraft/client/Minecraft/field_71462_r cyc/n -FD: net/minecraft/client/Minecraft/field_213279_p cyc/o -FD: net/minecraft/client/Minecraft/field_71460_t cyc/p -FD: net/minecraft/client/Minecraft/field_184132_p cyc/q -FD: net/minecraft/client/Minecraft/field_71429_W cyc/r -FD: net/minecraft/client/Minecraft/field_71456_v cyc/s -FD: net/minecraft/client/Minecraft/field_71454_w cyc/t -FD: net/minecraft/client/Minecraft/field_71476_x cyc/u -FD: net/minecraft/client/Minecraft/field_71474_y cyc/v -FD: net/minecraft/client/Minecraft/field_71417_B cyc/w -FD: net/minecraft/client/Minecraft/field_195559_v cyc/x -FD: net/minecraft/client/Minecraft/field_71412_D cyc/y -FD: net/minecraft/client/Minecraft/field_181542_y cyc/z -FD: net/minecraft/client/Minecraft/field_147124_at cyc/aA -FD: net/minecraft/client/Minecraft/field_147128_au cyc/aB -FD: net/minecraft/client/Minecraft/field_147127_av cyc/aC -FD: net/minecraft/client/Minecraft/field_147126_aw cyc/aD -FD: net/minecraft/client/Minecraft/field_211501_aD cyc/aE -FD: net/minecraft/client/Minecraft/field_213271_aF cyc/aF -FD: net/minecraft/client/Minecraft/field_152355_az cyc/aG -FD: net/minecraft/client/Minecraft/field_152350_aA cyc/aH -FD: net/minecraft/client/Minecraft/field_152352_aC cyc/aI -FD: net/minecraft/client/Minecraft/field_175617_aL cyc/aJ -FD: net/minecraft/client/Minecraft/field_175618_aM cyc/aK -FD: net/minecraft/client/Minecraft/field_213272_aL cyc/aL -FD: net/minecraft/client/Minecraft/field_213273_aM cyc/aM -FD: net/minecraft/client/Minecraft/field_193034_aS cyc/aN -FD: net/minecraft/client/Minecraft/field_213274_aO cyc/aO -FD: net/minecraft/client/Minecraft/field_71425_J cyc/aP -FD: net/minecraft/client/Minecraft/field_71419_L cyc/aQ -FD: net/minecraft/client/Minecraft/field_71420_M cyc/aR -FD: net/minecraft/client/Minecraft/field_193035_aW cyc/aS -FD: net/minecraft/client/Minecraft/field_195555_I cyc/aT -FD: net/minecraft/client/Minecraft/field_213275_aU cyc/aU -FD: net/minecraft/client/Minecraft/field_213276_aV cyc/aV -FD: net/minecraft/client/Minecraft/field_71465_an cyc/aW -FD: net/minecraft/client/Minecraft/field_71445_n cyc/aa -FD: net/minecraft/client/Minecraft/field_193996_ah cyc/ab -FD: net/minecraft/client/Minecraft/field_71437_Z cyc/ac -FD: net/minecraft/client/Minecraft/field_213277_ad cyc/ad -FD: net/minecraft/client/Minecraft/field_191950_u cyc/ae -FD: net/minecraft/client/Minecraft/field_110446_Y cyc/af -FD: net/minecraft/client/Minecraft/field_110447_Z cyc/ag -FD: net/minecraft/client/Minecraft/field_184130_ao cyc/ah -FD: net/minecraft/client/Minecraft/field_110453_aa cyc/ai -FD: net/minecraft/client/Minecraft/field_71469_aa cyc/aj -FD: net/minecraft/client/Minecraft/field_71470_ab cyc/ak -FD: net/minecraft/client/Minecraft/field_71467_ac cyc/al -FD: net/minecraft/client/Minecraft/field_71475_ae cyc/am -FD: net/minecraft/client/Minecraft/field_71477_af cyc/an -FD: net/minecraft/client/Minecraft/field_181543_z cyc/ao -FD: net/minecraft/client/Minecraft/field_147129_ai cyc/ap -FD: net/minecraft/client/Minecraft/field_71459_aj cyc/aq -FD: net/minecraft/client/Minecraft/field_71453_ak cyc/ar -FD: net/minecraft/client/Minecraft/field_71455_al cyc/as -FD: net/minecraft/client/Minecraft/field_71424_I cyc/at -FD: net/minecraft/client/Minecraft/field_110451_am cyc/au -FD: net/minecraft/client/Minecraft/field_195554_ax cyc/av -FD: net/minecraft/client/Minecraft/field_110448_aq cyc/aw -FD: net/minecraft/client/Minecraft/field_135017_as cyc/ax -FD: net/minecraft/client/Minecraft/field_184127_aH cyc/ay -FD: net/minecraft/client/Minecraft/field_184128_aI cyc/az -FD: net/minecraft/client/multiplayer/ServerData$ServerResourceMode/ENABLED dki$a/a -FD: net/minecraft/client/multiplayer/ServerData$ServerResourceMode/DISABLED dki$a/b -FD: net/minecraft/client/multiplayer/ServerData$ServerResourceMode/PROMPT dki$a/c -FD: net/minecraft/client/multiplayer/ServerData$ServerResourceMode/field_152594_d dki$a/d -FD: net/minecraft/client/multiplayer/ServerData$ServerResourceMode/$VALUES dki$a/e -FD: net/minecraft/client/multiplayer/ServerData/field_78847_a dki/a -FD: net/minecraft/client/multiplayer/ServerData/field_78845_b dki/b -FD: net/minecraft/client/multiplayer/ServerData/field_78846_c dki/c -FD: net/minecraft/client/multiplayer/ServerData/field_78843_d dki/d -FD: net/minecraft/client/multiplayer/ServerData/field_78844_e dki/e -FD: net/minecraft/client/multiplayer/ServerData/field_82821_f dki/f -FD: net/minecraft/client/multiplayer/ServerData/field_82822_g dki/g -FD: net/minecraft/client/multiplayer/ServerData/field_78841_f dki/h -FD: net/minecraft/client/multiplayer/ServerData/field_147412_i dki/i -FD: net/minecraft/client/multiplayer/ServerData/field_152587_j dki/j -FD: net/minecraft/client/multiplayer/ServerData/field_147411_m dki/k -FD: net/minecraft/client/multiplayer/ServerData/field_181042_l dki/l -FD: net/minecraft/client/renderer/ThreadDownloadImageData$1/field_110932_a dws$1/a -FD: net/minecraft/client/renderer/ThreadDownloadImageData/field_147644_c dws/g -FD: net/minecraft/client/renderer/ThreadDownloadImageData/field_147643_d dws/h -FD: net/minecraft/client/renderer/ThreadDownloadImageData/field_152434_e dws/i -FD: net/minecraft/client/renderer/ThreadDownloadImageData/field_110562_b dws/j -FD: net/minecraft/client/renderer/ThreadDownloadImageData/field_110563_c dws/k -FD: net/minecraft/client/renderer/ThreadDownloadImageData/field_110561_e dws/l -FD: net/minecraft/client/renderer/ThreadDownloadImageData/field_110559_g dws/m -FD: net/minecraft/client/renderer/texture/SimpleTexture$TextureData/field_217802_a dwx$a/a -FD: net/minecraft/client/renderer/texture/SimpleTexture$TextureData/field_217803_b dwx$a/b -FD: net/minecraft/client/renderer/texture/SimpleTexture$TextureData/field_217804_c dwx$a/c -FD: net/minecraft/client/renderer/texture/SimpleTexture/field_110568_b dwx/f -FD: net/minecraft/client/renderer/texture/SimpleTexture/field_147639_c dwx/g -FD: net/minecraft/client/renderer/texture/TextureManager/field_194008_a dxc/a -FD: net/minecraft/client/renderer/texture/TextureManager/field_147646_a dxc/b -FD: net/minecraft/client/renderer/texture/TextureManager/field_110585_a dxc/c -FD: net/minecraft/client/renderer/texture/TextureManager/field_110583_b dxc/d -FD: net/minecraft/client/renderer/texture/TextureManager/field_110584_c dxc/e -FD: net/minecraft/client/renderer/texture/TextureManager/field_110582_d dxc/f -FD: net/minecraft/client/resources/DefaultPlayerSkin/field_177337_a dxl/a -FD: net/minecraft/client/resources/DefaultPlayerSkin/field_177336_b dxl/b -FD: net/minecraft/client/resources/SkinManager$1/field_152787_a dxt$1/a -FD: net/minecraft/client/resources/SkinManager$2/field_152635_a dxt$2/a -FD: net/minecraft/client/resources/SkinManager$2/field_152636_b dxt$2/b -FD: net/minecraft/client/resources/SkinManager$2/field_152637_c dxt$2/c -FD: net/minecraft/client/resources/SkinManager$2/field_152638_d dxt$2/d -FD: net/minecraft/client/resources/SkinManager$2/field_177249_e dxt$2/e -FD: net/minecraft/client/resources/SkinManager$2/field_152639_e dxt$2/f -FD: net/minecraft/client/resources/SkinManager/field_152794_b dxt/a -FD: net/minecraft/client/resources/SkinManager/field_152795_c dxt/b -FD: net/minecraft/client/resources/SkinManager/field_152796_d dxt/c -FD: net/minecraft/client/resources/SkinManager/field_152797_e dxt/d -FD: net/minecraft/client/resources/SkinManager/field_152798_f dxt/e -MD: net/minecraft/util/ResourceLocation$Serializer/deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/util/ResourceLocation; qv$a/a (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Lqv; -MD: net/minecraft/util/ResourceLocation$Serializer/serialize (Lnet/minecraft/util/ResourceLocation;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; qv$a/a (Lqv;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; -MD: net/minecraft/util/ResourceLocation$Serializer/serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; qv$a/serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; -MD: net/minecraft/util/ResourceLocation$Serializer/deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; qv$a/deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; -MD: net/minecraft/util/ResourceLocation/func_110623_a ()Ljava/lang/String; qv/a ()Ljava/lang/String; -MD: net/minecraft/util/ResourceLocation/func_195824_a (C)Z qv/a (C)Z -MD: net/minecraft/util/ResourceLocation/func_217859_a (I)Z qv/a (I)Z -MD: net/minecraft/util/ResourceLocation/func_195826_a (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/util/ResourceLocation; qv/a (Lcom/mojang/brigadier/StringReader;)Lqv; -MD: net/minecraft/util/ResourceLocation/func_208304_a (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; qv/a (Ljava/lang/String;)Lqv; -MD: net/minecraft/util/ResourceLocation/func_195828_a (Ljava/lang/String;C)Lnet/minecraft/util/ResourceLocation; qv/a (Ljava/lang/String;C)Lqv; -MD: net/minecraft/util/ResourceLocation/compareTo (Lnet/minecraft/util/ResourceLocation;)I qv/a (Lqv;)I -MD: net/minecraft/util/ResourceLocation/func_110624_b ()Ljava/lang/String; qv/b ()Ljava/lang/String; -MD: net/minecraft/util/ResourceLocation/func_217857_b (I)Z qv/b (I)Z -MD: net/minecraft/util/ResourceLocation/func_217855_b (Ljava/lang/String;)Z qv/b (Ljava/lang/String;)Z -MD: net/minecraft/util/ResourceLocation/func_195823_b (Ljava/lang/String;C)[Ljava/lang/String; qv/b (Ljava/lang/String;C)[Ljava/lang/String; -MD: net/minecraft/util/ResourceLocation/func_217856_c (Ljava/lang/String;)Z qv/c (Ljava/lang/String;)Z -MD: net/minecraft/util/ResourceLocation/func_217858_d (Ljava/lang/String;)Z qv/d (Ljava/lang/String;)Z -MD: net/minecraft/util/ResourceLocation/equals (Ljava/lang/Object;)Z qv/equals (Ljava/lang/Object;)Z -MD: net/minecraft/util/ResourceLocation/hashCode ()I qv/hashCode ()I -MD: net/minecraft/util/ResourceLocation/toString ()Ljava/lang/String; qv/toString ()Ljava/lang/String; -MD: net/minecraft/util/ResourceLocation/compareTo (Ljava/lang/Object;)I qv/compareTo (Ljava/lang/Object;)I -MD: net/minecraft/util/StringUtils/func_76337_a (I)Ljava/lang/String; aae/a (I)Ljava/lang/String; -MD: net/minecraft/util/StringUtils/func_76338_a (Ljava/lang/String;)Ljava/lang/String; aae/a (Ljava/lang/String;)Ljava/lang/String; -MD: net/minecraft/util/StringUtils/func_151246_b (Ljava/lang/String;)Z aae/b (Ljava/lang/String;)Z -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211651_a ()I cuj$a/a ()I -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211652_a (I)Lnet/minecraft/client/renderer/texture/NativeImage$PixelFormat; cuj$a/a (I)Lcuj$a; -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211655_a (Lnet/minecraft/client/renderer/texture/NativeImage$PixelFormat;)I cuj$a/a (Lcuj$a;)I -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211656_b ()V cuj$a/b ()V -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211646_b (I)Lnet/minecraft/client/renderer/texture/NativeImage$PixelFormat; cuj$a/b (I)Lcuj$a; -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211658_c ()V cuj$a/c ()V -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211650_d ()I cuj$a/d ()I -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211645_i ()Z cuj$a/e ()Z -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211648_n ()I cuj$a/f ()I -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211653_r ()Z cuj$a/g ()Z -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211647_v ()I cuj$a/h ()I -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/func_211654_w ()Z cuj$a/i ()Z -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/values ()[Lnet/minecraft/client/renderer/texture/NativeImage$PixelFormat; cuj$a/values ()[Lcuj$a; -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormat/valueOf (Ljava/lang/String;)Lnet/minecraft/client/renderer/texture/NativeImage$PixelFormat; cuj$a/valueOf (Ljava/lang/String;)Lcuj$a; -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode/func_211672_a ()I cuj$b/a ()I -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode/values ()[Lnet/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode; cuj$b/values ()[Lcuj$b; -MD: net/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode/valueOf (Ljava/lang/String;)Lnet/minecraft/client/renderer/texture/NativeImage$PixelFormatGLCode; cuj$b/valueOf (Ljava/lang/String;)Lcuj$b; -MD: net/minecraft/client/renderer/texture/NativeImage$WriteCallback/func_209267_a ()V cuj$c/a ()V -MD: net/minecraft/client/renderer/texture/NativeImage$WriteCallback/invoke (JJI)V cuj$c/invoke (JJI)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195702_a ()I cuj/a ()I -MD: net/minecraft/client/renderer/texture/NativeImage/func_195709_a (II)I cuj/a (II)I -MD: net/minecraft/client/renderer/texture/NativeImage/func_195700_a (III)V cuj/a (III)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195715_a (IIIII)V cuj/a (IIIII)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195706_a (IIIIIIIZ)V cuj/a (IIIIIIIZ)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195712_a (IIIIIIIZZZ)V cuj/a (IIIIIIIZZZ)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195699_a (IIIIIIZZ)V cuj/a (IIIIIIZZ)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195708_a (IIIILnet/minecraft/client/renderer/texture/NativeImage;)V cuj/a (IIIILcuj;)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195697_a (IIIZ)V cuj/a (IIIZ)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195717_a (IZ)V cuj/a (IZ)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_211679_a (Lnet/minecraft/client/renderer/texture/NativeImage$PixelFormat;Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; cuj/a (Lcuj$a;Ljava/io/InputStream;)Lcuj; -MD: net/minecraft/client/renderer/texture/NativeImage/func_211677_a (Lnet/minecraft/client/renderer/texture/NativeImage$PixelFormat;Ljava/nio/ByteBuffer;)Lnet/minecraft/client/renderer/texture/NativeImage; cuj/a (Lcuj$a;Ljava/nio/ByteBuffer;)Lcuj; -MD: net/minecraft/client/renderer/texture/NativeImage/func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V cuj/a (Lcuj;)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_209271_a (Ljava/io/File;)V cuj/a (Ljava/io/File;)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195713_a (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; cuj/a (Ljava/io/InputStream;)Lcuj; -MD: net/minecraft/client/renderer/texture/NativeImage/func_216510_a (Ljava/lang/String;)V cuj/a (Ljava/lang/String;)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195704_a (Ljava/nio/ByteBuffer;)Lnet/minecraft/client/renderer/texture/NativeImage; cuj/a (Ljava/nio/ByteBuffer;)Lcuj; -MD: net/minecraft/client/renderer/texture/NativeImage/func_209270_a (Ljava/nio/file/Path;)V cuj/a (Ljava/nio/file/Path;)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_211676_a (Lorg/lwjgl/stb/STBTTFontinfo;IIIFFFFII)V cuj/a (Lorg/lwjgl/stb/STBTTFontinfo;IIIFFFFII)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195701_a (Z)V cuj/a (Z)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195705_a (ZZ)V cuj/a (ZZ)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195714_b ()I cuj/b ()I -MD: net/minecraft/client/renderer/texture/NativeImage/func_211675_e (II)B cuj/b (II)B -MD: net/minecraft/client/renderer/texture/NativeImage/func_195718_b (III)V cuj/b (III)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_216511_b (Ljava/lang/String;)Lnet/minecraft/client/renderer/texture/NativeImage; cuj/b (Ljava/lang/String;)Lcuj; -MD: net/minecraft/client/renderer/texture/NativeImage/func_195707_b (Z)V cuj/b (Z)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_211678_c ()Lnet/minecraft/client/renderer/texture/NativeImage$PixelFormat; cuj/c ()Lcuj$a; -MD: net/minecraft/client/renderer/texture/NativeImage/func_195716_c ()[I cuj/d ()[I -MD: net/minecraft/client/renderer/texture/NativeImage/func_195710_e ()V cuj/e ()V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195711_f ()V cuj/f ()V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195696_g ()V cuj/g ()V -MD: net/minecraft/client/renderer/texture/NativeImage/close ()V cuj/close ()V -MD: net/minecraft/client/renderer/texture/NativeImage/toString ()Ljava/lang/String; cuj/toString ()Ljava/lang/String; -MD: net/minecraft/client/Minecraft$1/run ()V cyc$1/run ()V -MD: net/minecraft/client/Minecraft/func_71401_C ()Lnet/minecraft/server/integrated/IntegratedServer; cyc/A ()Leac; -MD: net/minecraft/client/Minecraft/func_71378_E ()Lnet/minecraft/profiler/Snooper; cyc/B ()Lahq; -MD: net/minecraft/client/Minecraft/func_110432_I ()Lnet/minecraft/util/Session; cyc/C ()Lcyn; -MD: net/minecraft/client/Minecraft/func_181037_M ()Lcom/mojang/authlib/properties/PropertyMap; cyc/D ()Lcom/mojang/authlib/properties/PropertyMap; -MD: net/minecraft/client/Minecraft/func_110437_J ()Ljava/net/Proxy; cyc/E ()Ljava/net/Proxy; -MD: net/minecraft/client/Minecraft/func_110434_K ()Lnet/minecraft/client/renderer/texture/TextureManager; cyc/F ()Ldxc; -MD: net/minecraft/client/Minecraft/func_195551_G ()Lnet/minecraft/resources/IResourceManager; cyc/G ()Lxi; -MD: net/minecraft/client/Minecraft/func_195548_H ()Lnet/minecraft/resources/ResourcePackList; cyc/H ()Lwx; -MD: net/minecraft/client/Minecraft/func_195541_I ()Lnet/minecraft/client/resources/DownloadingPackFinder; cyc/I ()Ldxj; -MD: net/minecraft/client/Minecraft/func_195549_J ()Ljava/io/File; cyc/J ()Ljava/io/File; -MD: net/minecraft/client/Minecraft/func_135016_M ()Lnet/minecraft/client/resources/LanguageManager; cyc/K ()Ldxz; -MD: net/minecraft/client/Minecraft/func_147117_R ()Lnet/minecraft/client/renderer/texture/AtlasTexture; cyc/L ()Ldxa; -MD: net/minecraft/client/Minecraft/func_147111_S ()Z cyc/M ()Z -MD: net/minecraft/client/Minecraft/func_147113_T ()Z cyc/N ()Z -MD: net/minecraft/client/Minecraft/func_147118_V ()Lnet/minecraft/client/audio/SoundHandler; cyc/O ()Leap; -MD: net/minecraft/client/Minecraft/func_147109_W ()Lnet/minecraft/client/audio/MusicTicker$MusicType; cyc/P ()Leak$a; -MD: net/minecraft/client/Minecraft/func_152347_ac ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; cyc/Q ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; -MD: net/minecraft/client/Minecraft/func_152342_ad ()Lnet/minecraft/client/resources/SkinManager; cyc/S ()Ldxt; -MD: net/minecraft/client/Minecraft/func_175606_aa ()Lnet/minecraft/entity/Entity; cyc/T ()Laio; -MD: net/minecraft/client/Minecraft/func_175602_ab ()Lnet/minecraft/client/renderer/BlockRendererDispatcher; cyc/U ()Ldnw; -MD: net/minecraft/client/Minecraft/func_175598_ae ()Lnet/minecraft/client/renderer/entity/EntityRendererManager; cyc/V ()Ldsa; -MD: net/minecraft/client/Minecraft/func_175599_af ()Lnet/minecraft/client/renderer/ItemRenderer; cyc/W ()Ldsv; -MD: net/minecraft/client/Minecraft/func_175597_ag ()Lnet/minecraft/client/renderer/FirstPersonRenderer; cyc/X ()Ldne; -MD: net/minecraft/client/Minecraft/func_175610_ah ()I cyc/Y ()I -MD: net/minecraft/client/Minecraft/func_181539_aj ()Lnet/minecraft/util/FrameTimer; cyc/Z ()Lzr; -MD: net/minecraft/client/Minecraft/func_213226_a ()V cyc/a ()V -MD: net/minecraft/client/Minecraft/func_71383_b (I)V cyc/a (I)V -MD: net/minecraft/client/Minecraft/func_195545_a (IJ)V cyc/a (IJ)V -MD: net/minecraft/client/Minecraft/func_70000_a (Lnet/minecraft/profiler/Snooper;)V cyc/a (Lahq;)V -MD: net/minecraft/client/Minecraft/func_175607_a (Lnet/minecraft/entity/Entity;)V cyc/a (Laio;)V -MD: net/minecraft/client/Minecraft/func_213235_a (Lnet/minecraft/item/ItemStack;)Ljava/util/stream/Stream; cyc/a (Lbcj;)Ljava/util/stream/Stream; -MD: net/minecraft/client/Minecraft/func_184119_a (Lnet/minecraft/item/ItemStack;Lnet/minecraft/tileentity/TileEntity;)Lnet/minecraft/item/ItemStack; cyc/a (Lbcj;Lbtw;)Lbcj; -MD: net/minecraft/client/Minecraft/func_213244_a (Lnet/minecraft/item/crafting/IRecipe;)Lnet/minecraft/util/ResourceLocation; cyc/a (Lber;)Lqv; -MD: net/minecraft/client/Minecraft/access$000 (Lnet/minecraft/client/Minecraft;)Z cyc/a (Lcyc;)Z -MD: net/minecraft/client/Minecraft/func_71404_a (Lnet/minecraft/crash/CrashReport;)V cyc/a (Ld;)V -MD: net/minecraft/client/Minecraft/func_213268_a (Lnet/minecraft/client/gui/LoadingGui;)V cyc/a (Ldcg;)V -MD: net/minecraft/client/Minecraft/func_147108_a (Lnet/minecraft/client/gui/screen/Screen;)V cyc/a (Ldcl;)V -MD: net/minecraft/client/Minecraft/func_213258_a (Lnet/minecraft/client/gui/recipebook/RecipeList;)Ljava/util/stream/Stream; cyc/a (Ldfc;)Ljava/util/stream/Stream; -MD: net/minecraft/client/Minecraft/func_71403_a (Lnet/minecraft/client/world/ClientWorld;)V cyc/a (Ldkf;)V -MD: net/minecraft/client/Minecraft/func_71351_a (Lnet/minecraft/client/multiplayer/ServerData;)V cyc/a (Ldki;)V -MD: net/minecraft/client/Minecraft/func_213232_a (Lnet/minecraft/client/util/SearchTree;Lnet/minecraft/client/util/SearchTreeReloadable;Lnet/minecraft/item/ItemStack;)V cyc/a (Ldzw;Ldzv;Lbcj;)V -MD: net/minecraft/client/Minecraft/func_213253_a (Lnet/minecraft/client/util/SearchTreeManager$Key;)Lnet/minecraft/client/util/IMutableSearchTree; cyc/a (Ldzx$a;)Ldzu; -MD: net/minecraft/client/Minecraft/func_213238_a (Ljava/lang/String;)Z cyc/a (Ljava/lang/String;)Z -MD: net/minecraft/client/Minecraft/func_71371_a (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/world/WorldSettings;)V cyc/a (Ljava/lang/String;Ljava/lang/String;Lbhv;)V -MD: net/minecraft/client/Minecraft/func_213262_a (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/resources/IResourcePack;Lnet/minecraft/resources/data/PackMetadataSection;Lnet/minecraft/resources/ResourcePackInfo$Priority;)Lnet/minecraft/client/resources/ClientResourcePackInfo; cyc/a (Ljava/lang/String;ZLjava/util/function/Supplier;Lwl;Lwq;Lxa$a;)Ldxw; -MD: net/minecraft/client/Minecraft/func_213236_a (Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)V cyc/a (Ljava/util/List;Ljava/util/concurrent/CompletableFuture;)V -MD: net/minecraft/client/Minecraft/func_213240_a (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; cyc/a (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; -MD: net/minecraft/client/Minecraft/func_213228_a (Z)V cyc/a (Z)V -MD: net/minecraft/client/Minecraft/func_99999_d ()V cyc/b ()V -MD: net/minecraft/client/Minecraft/func_213246_b (I)Lnet/minecraft/world/chunk/listener/IChunkStatusListener; cyc/b (I)Lvt; -MD: net/minecraft/client/Minecraft/func_213251_b (Lnet/minecraft/item/ItemStack;)Ljava/util/stream/Stream; cyc/b (Lbcj;)Ljava/util/stream/Stream; -MD: net/minecraft/client/Minecraft/func_213234_b (Lnet/minecraft/item/crafting/IRecipe;)Ljava/util/stream/Stream; cyc/b (Lber;)Ljava/util/stream/Stream; -MD: net/minecraft/client/Minecraft/func_71396_d (Lnet/minecraft/crash/CrashReport;)Lnet/minecraft/crash/CrashReport; cyc/b (Ld;)Ld; -MD: net/minecraft/client/Minecraft/func_213231_b (Lnet/minecraft/client/gui/screen/Screen;)V cyc/b (Ldcl;)V -MD: net/minecraft/client/Minecraft/func_213252_b (Lnet/minecraft/client/gui/recipebook/RecipeList;)Ljava/util/stream/Stream; cyc/b (Ldfc;)Ljava/util/stream/Stream; -MD: net/minecraft/client/Minecraft/func_213257_b (Lnet/minecraft/client/world/ClientWorld;)V cyc/b (Ldkf;)V -MD: net/minecraft/client/Minecraft/func_213267_b (Ljava/lang/String;)Z cyc/b (Ljava/lang/String;)Z -MD: net/minecraft/client/Minecraft/func_213265_b (Ljava/util/concurrent/CompletableFuture;)V cyc/b (Ljava/util/concurrent/CompletableFuture;)V -MD: net/minecraft/client/Minecraft/func_213270_b (Ljava/util/function/Supplier;)Lnet/minecraft/resources/IResourcePack; cyc/b (Ljava/util/function/Supplier;)Lwl; -MD: net/minecraft/client/Minecraft/func_213261_b (Lnet/minecraft/util/text/ITextComponent;)V cyc/b (Ljo;)V -MD: net/minecraft/client/Minecraft/func_213227_b (Z)V cyc/b (Z)V -MD: net/minecraft/client/Minecraft/func_147110_a ()Lnet/minecraft/client/shader/Framebuffer; cyc/c ()Lctz; -MD: net/minecraft/client/Minecraft/func_213242_c (Lnet/minecraft/item/ItemStack;)Ljava/util/stream/Stream; cyc/c (Lbcj;)Ljava/util/stream/Stream; -MD: net/minecraft/client/Minecraft/func_71377_b (Lnet/minecraft/crash/CrashReport;)V cyc/c (Ld;)V -MD: net/minecraft/client/Minecraft/func_213241_c (Lnet/minecraft/client/gui/screen/Screen;)V cyc/c (Ldcl;)V -MD: net/minecraft/client/Minecraft/func_212874_c_ (Ljava/lang/Runnable;)Z cyc/c (Ljava/lang/Runnable;)Z -MD: net/minecraft/client/Minecraft/func_213264_c (Lnet/minecraft/util/text/ITextComponent;)Ljava/lang/String; cyc/c (Ljo;)Ljava/lang/String; -MD: net/minecraft/client/Minecraft/func_71385_j (Z)V cyc/c (Z)V -MD: net/minecraft/client/Minecraft/func_175600_c ()Ljava/lang/String; cyc/d ()Ljava/lang/String; -MD: net/minecraft/client/Minecraft/func_212875_d_ (Ljava/lang/Runnable;)Ljava/lang/Runnable; cyc/d (Ljava/lang/Runnable;)Ljava/lang/Runnable; -MD: net/minecraft/client/Minecraft/func_213230_d (Lnet/minecraft/util/text/ITextComponent;)Ljava/lang/String; cyc/d (Ljo;)Ljava/lang/String; -MD: net/minecraft/client/Minecraft/func_181537_a (Z)V cyc/d (Z)V -MD: net/minecraft/client/Minecraft/func_184123_d ()Ljava/lang/String; cyc/e ()Ljava/lang/String; -MD: net/minecraft/client/Minecraft/func_195542_b (Z)V cyc/e (Z)V -MD: net/minecraft/client/Minecraft/func_211821_e ()Z cyc/f ()Z -MD: net/minecraft/client/Minecraft/func_147115_a (Z)V cyc/f (Z)V -MD: net/minecraft/client/Minecraft/func_213237_g ()Ljava/util/concurrent/CompletableFuture; cyc/g ()Ljava/util/concurrent/CompletableFuture; -MD: net/minecraft/client/Minecraft/func_71359_d ()Lnet/minecraft/world/storage/SaveFormat; cyc/h ()Lcoq; -MD: net/minecraft/client/Minecraft/func_71405_e ()V cyc/i ()V -MD: net/minecraft/client/Minecraft/func_71398_f ()V cyc/j ()V -MD: net/minecraft/client/Minecraft/func_71400_g ()V cyc/k ()V -MD: net/minecraft/client/Minecraft/func_181535_r ()Lnet/minecraft/client/audio/MusicTicker; cyc/l ()Leak; -MD: net/minecraft/client/Minecraft/func_71407_l ()V cyc/m ()V -MD: net/minecraft/client/Minecraft/func_213254_o ()V cyc/n ()V -MD: net/minecraft/client/Minecraft/func_71355_q ()Z cyc/o ()Z -MD: net/minecraft/client/Minecraft/func_147114_u ()Lnet/minecraft/client/network/play/ClientPlayNetHandler; cyc/p ()Ldkc; -MD: net/minecraft/client/Minecraft/func_71382_s ()Z cyc/r ()Z -MD: net/minecraft/client/Minecraft/func_71375_t ()Z cyc/s ()Z -MD: net/minecraft/client/Minecraft/func_71379_u ()Z cyc/t ()Z -MD: net/minecraft/client/Minecraft/func_71410_x ()Lnet/minecraft/client/Minecraft; cyc/u ()Lcyc; -MD: net/minecraft/client/Minecraft/func_213245_w ()Ljava/util/concurrent/CompletableFuture; cyc/v ()Ljava/util/concurrent/CompletableFuture; -MD: net/minecraft/client/Minecraft/func_71369_N ()I cyc/w ()I -MD: net/minecraft/client/Minecraft/func_147104_D ()Lnet/minecraft/client/multiplayer/ServerData; cyc/x ()Ldki; -MD: net/minecraft/client/Minecraft/func_71387_A ()Z cyc/y ()Z -MD: net/minecraft/client/Minecraft/func_71356_B ()Z cyc/z ()Z -MD: net/minecraft/client/Minecraft/func_213256_aB ()V cyc/aA ()V -MD: net/minecraft/client/Minecraft/func_213243_aC ()I cyc/aB ()I -MD: net/minecraft/client/Minecraft/func_213266_aD ()Z cyc/aC ()Z -MD: net/minecraft/client/Minecraft/func_203410_as ()V cyc/aD ()V -MD: net/minecraft/client/Minecraft/func_147116_af ()V cyc/aE ()V -MD: net/minecraft/client/Minecraft/func_147121_ag ()V cyc/aF ()V -MD: net/minecraft/client/Minecraft/func_184117_aA ()V cyc/aG ()V -MD: net/minecraft/client/Minecraft/func_147112_ai ()V cyc/aH ()V -MD: net/minecraft/client/Minecraft/func_181538_aA ()Ljava/lang/String; cyc/aI ()Ljava/lang/String; -MD: net/minecraft/client/Minecraft/func_213255_aK ()Ljava/lang/String; cyc/aJ ()Ljava/lang/String; -MD: net/minecraft/client/Minecraft/func_213259_aL ()Ljava/lang/String; cyc/aK ()Ljava/lang/String; -MD: net/minecraft/client/Minecraft/func_211822_az ()Ljava/lang/String; cyc/aL ()Ljava/lang/String; -MD: net/minecraft/client/Minecraft/func_211816_aA ()Ljava/lang/String; cyc/aM ()Ljava/lang/String; -MD: net/minecraft/client/Minecraft/func_211112_aw ()Ljava/lang/String; cyc/aN ()Ljava/lang/String; -MD: net/minecraft/client/Minecraft/func_213249_aP ()Z cyc/aO ()Z -MD: net/minecraft/client/Minecraft/func_213233_aQ ()V cyc/aP ()V -MD: net/minecraft/client/Minecraft/func_213260_aR ()V cyc/aQ ()V -MD: net/minecraft/client/Minecraft/func_213247_aS ()I cyc/aR ()I -MD: net/minecraft/client/Minecraft/func_181540_al ()Z cyc/aa ()Z -MD: net/minecraft/client/Minecraft/func_184126_aj ()Lcom/mojang/datafixers/DataFixer; cyc/ab ()Lcom/mojang/datafixers/DataFixer; -MD: net/minecraft/client/Minecraft/func_184121_ak ()F cyc/ac ()F -MD: net/minecraft/client/Minecraft/func_193989_ak ()F cyc/ad ()F -MD: net/minecraft/client/Minecraft/func_184125_al ()Lnet/minecraft/client/renderer/color/BlockColors; cyc/ae ()Lcyp; -MD: net/minecraft/client/Minecraft/func_189648_am ()Z cyc/ag ()Z -MD: net/minecraft/client/Minecraft/func_193033_an ()Lnet/minecraft/client/gui/toasts/ToastGui; cyc/ah ()Ldan; -MD: net/minecraft/client/Minecraft/func_193032_ao ()Lnet/minecraft/client/tutorial/Tutorial; cyc/ai ()Leaz; -MD: net/minecraft/client/Minecraft/func_195544_aj ()Z cyc/aj ()Z -MD: net/minecraft/client/Minecraft/func_199403_al ()Lnet/minecraft/client/settings/CreativeSettings; cyc/ak ()Lcxy; -MD: net/minecraft/client/Minecraft/func_209506_al ()Lnet/minecraft/client/renderer/model/ModelManager; cyc/al ()Ldyt; -MD: net/minecraft/client/Minecraft/func_211500_ak ()Lnet/minecraft/client/gui/fonts/FontResourceManager; cyc/am ()Ldar; -MD: net/minecraft/client/Minecraft/func_213263_ao ()Lnet/minecraft/client/renderer/texture/PaintingSpriteUploader; cyc/an ()Ldxs; -MD: net/minecraft/client/Minecraft/func_213248_ap ()Lnet/minecraft/client/renderer/texture/PotionSpriteUploader; cyc/ao ()Ldxr; -MD: net/minecraft/client/Minecraft/func_213239_aq ()Lnet/minecraft/profiler/IProfiler; cyc/ap ()Lagn; -MD: net/minecraft/client/Minecraft/func_213229_ar ()Lnet/minecraft/client/MinecraftGame; cyc/aq ()Lcxw; -MD: net/minecraft/client/Minecraft/func_213269_at ()Lnet/minecraft/client/util/Splashes; cyc/as ()Ldxu; -MD: net/minecraft/client/Minecraft/func_213250_au ()Lnet/minecraft/client/gui/LoadingGui; cyc/at ()Ldcg; -MD: net/minecraft/client/Minecraft/func_71384_a ()V cyc/au ()V -MD: net/minecraft/client/Minecraft/func_193986_ar ()V cyc/av ()V -MD: net/minecraft/client/Minecraft/func_147122_X ()Z cyc/aw ()Z -MD: net/minecraft/client/Minecraft/func_213170_ax ()Ljava/lang/Thread; cyc/ay ()Ljava/lang/Thread; -MD: net/minecraft/client/Minecraft/func_71389_H ()V cyc/az ()V -MD: net/minecraft/client/Minecraft/close ()V cyc/close ()V -MD: net/minecraft/client/multiplayer/ServerData$ServerResourceMode/func_152589_a ()Lnet/minecraft/util/text/ITextComponent; dki$a/a ()Ljo; -MD: net/minecraft/client/multiplayer/ServerData$ServerResourceMode/values ()[Lnet/minecraft/client/multiplayer/ServerData$ServerResourceMode; dki$a/values ()[Ldki$a; -MD: net/minecraft/client/multiplayer/ServerData$ServerResourceMode/valueOf (Ljava/lang/String;)Lnet/minecraft/client/multiplayer/ServerData$ServerResourceMode; dki$a/valueOf (Ljava/lang/String;)Ldki$a; -MD: net/minecraft/client/multiplayer/ServerData/func_78836_a ()Lnet/minecraft/nbt/CompoundNBT; dki/a ()Lid; -MD: net/minecraft/client/multiplayer/ServerData/func_152584_a (Lnet/minecraft/client/multiplayer/ServerData$ServerResourceMode;)V dki/a (Ldki$a;)V -MD: net/minecraft/client/multiplayer/ServerData/func_152583_a (Lnet/minecraft/client/multiplayer/ServerData;)V dki/a (Ldki;)V -MD: net/minecraft/client/multiplayer/ServerData/func_78837_a (Lnet/minecraft/nbt/CompoundNBT;)Lnet/minecraft/client/multiplayer/ServerData; dki/a (Lid;)Ldki; -MD: net/minecraft/client/multiplayer/ServerData/func_147407_a (Ljava/lang/String;)V dki/a (Ljava/lang/String;)V -MD: net/minecraft/client/multiplayer/ServerData/func_152586_b ()Lnet/minecraft/client/multiplayer/ServerData$ServerResourceMode; dki/b ()Ldki$a; -MD: net/minecraft/client/multiplayer/ServerData/func_147409_e ()Ljava/lang/String; dki/c ()Ljava/lang/String; -MD: net/minecraft/client/multiplayer/ServerData/func_181041_d ()Z dki/d ()Z -MD: net/minecraft/client/renderer/IImageBuffer/func_152634_a ()V dnd/a ()V -MD: net/minecraft/client/renderer/IImageBuffer/func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; dnd/a (Lcuj;)Lcuj; -MD: net/minecraft/client/renderer/ImageBufferDownload/func_152634_a ()V dni/a ()V -MD: net/minecraft/client/renderer/ImageBufferDownload/func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; dni/a (Lcuj;)Lcuj; -MD: net/minecraft/client/renderer/ImageBufferDownload/func_195788_a (Lnet/minecraft/client/renderer/texture/NativeImage;IIII)V dni/a (Lcuj;IIII)V -MD: net/minecraft/client/renderer/ImageBufferDownload/func_195787_b (Lnet/minecraft/client/renderer/texture/NativeImage;IIII)V dni/b (Lcuj;IIII)V -MD: net/minecraft/client/renderer/ThreadDownloadImageData$1/func_217786_a (Ljava/io/InputStream;)V dws$1/a (Ljava/io/InputStream;)V -MD: net/minecraft/client/renderer/ThreadDownloadImageData$1/run ()V dws$1/run ()V -MD: net/minecraft/client/renderer/ThreadDownloadImageData/func_152433_a ()V dws/a ()V -MD: net/minecraft/client/renderer/ThreadDownloadImageData/func_195417_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V dws/a (Lcuj;)V -MD: net/minecraft/client/renderer/ThreadDownloadImageData/access$000 (Lnet/minecraft/client/renderer/ThreadDownloadImageData;)Ljava/lang/String; dws/a (Ldws;)Ljava/lang/String; -MD: net/minecraft/client/renderer/ThreadDownloadImageData/func_195413_a (Lnet/minecraft/resources/IResourceManager;)V dws/a (Lxi;)V -MD: net/minecraft/client/renderer/ThreadDownloadImageData/func_195416_b (Lnet/minecraft/client/renderer/texture/NativeImage;)V dws/b (Lcuj;)V -MD: net/minecraft/client/renderer/ThreadDownloadImageData/access$100 (Lnet/minecraft/client/renderer/ThreadDownloadImageData;)Ljava/io/File; dws/b (Ldws;)Ljava/io/File; -MD: net/minecraft/client/renderer/ThreadDownloadImageData/access$300 (Lnet/minecraft/client/renderer/ThreadDownloadImageData;)Lnet/minecraft/client/renderer/IImageBuffer; dws/c (Ldws;)Ldnd; -MD: net/minecraft/client/renderer/ThreadDownloadImageData/access$200 ()Lorg/apache/logging/log4j/Logger; dws/e ()Lorg/apache/logging/log4j/Logger; -MD: net/minecraft/client/renderer/texture/SimpleTexture$TextureData/func_217798_a ()Lnet/minecraft/client/resources/data/TextureMetadataSection; dwx$a/a ()Ldym; -MD: net/minecraft/client/renderer/texture/SimpleTexture$TextureData/func_217799_a (Lnet/minecraft/resources/IResourceManager;Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/SimpleTexture$TextureData; dwx$a/a (Lxi;Lqv;)Ldwx$a; -MD: net/minecraft/client/renderer/texture/SimpleTexture$TextureData/func_217800_b ()Lnet/minecraft/client/renderer/texture/NativeImage; dwx$a/b ()Lcuj; -MD: net/minecraft/client/renderer/texture/SimpleTexture$TextureData/func_217801_c ()V dwx$a/c ()V -MD: net/minecraft/client/renderer/texture/SimpleTexture$TextureData/close ()V dwx$a/close ()V -MD: net/minecraft/client/renderer/texture/SimpleTexture/func_195413_a (Lnet/minecraft/resources/IResourceManager;)V dwx/a (Lxi;)V -MD: net/minecraft/client/renderer/texture/SimpleTexture/func_215246_b (Lnet/minecraft/resources/IResourceManager;)Lnet/minecraft/client/renderer/texture/SimpleTexture$TextureData; dwx/b (Lxi;)Ldwx$a; -MD: net/minecraft/client/renderer/texture/SimpleTexture/func_215245_f ()Lorg/apache/logging/log4j/Logger; dwx/f ()Lorg/apache/logging/log4j/Logger; -MD: net/minecraft/client/renderer/texture/TextureManager/func_210123_a (Lnet/minecraft/client/renderer/texture/ITextureObject;)Ljava/lang/String; dxc/a (Ldxd;)Ljava/lang/String; -MD: net/minecraft/client/renderer/texture/TextureManager/func_110578_a (Ljava/lang/String;Lnet/minecraft/client/renderer/texture/DynamicTexture;)Lnet/minecraft/util/ResourceLocation; dxc/a (Ljava/lang/String;Ldwr;)Lqv; -MD: net/minecraft/client/renderer/texture/TextureManager/func_110577_a (Lnet/minecraft/util/ResourceLocation;)V dxc/a (Lqv;)V -MD: net/minecraft/client/renderer/texture/TextureManager/func_215267_a (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/PreloadedTexture;)V dxc/a (Lqv;Ldww;)V -MD: net/minecraft/client/renderer/texture/TextureManager/func_110579_a (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z dxc/a (Lqv;Ldxd;)Z -MD: net/minecraft/client/renderer/texture/TextureManager/func_110580_a (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITickableTextureObject;)Z dxc/a (Lqv;Ldxf;)Z -MD: net/minecraft/client/renderer/texture/TextureManager/func_215268_a (Lnet/minecraft/util/ResourceLocation;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; dxc/a (Lqv;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; -MD: net/minecraft/client/renderer/texture/TextureManager/func_215226_a (Lnet/minecraft/resources/IFutureReloadListener$IStage;Lnet/minecraft/resources/IResourceManager;Lnet/minecraft/profiler/IProfiler;Lnet/minecraft/profiler/IProfiler;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; dxc/a (Lxd$a;Lxi;Lagn;Lagn;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; -MD: net/minecraft/client/renderer/texture/TextureManager/func_215266_a (Lnet/minecraft/resources/IResourceManager;Ljava/util/concurrent/Executor;Ljava/lang/Void;)V dxc/a (Lxi;Ljava/util/concurrent/Executor;Ljava/lang/Void;)V -MD: net/minecraft/client/renderer/texture/TextureManager/func_110581_b (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; dxc/b (Lqv;)Ldxd; -MD: net/minecraft/client/renderer/texture/TextureManager/func_147645_c (Lnet/minecraft/util/ResourceLocation;)V dxc/c (Lqv;)V -MD: net/minecraft/client/renderer/texture/TextureManager/func_110550_d ()V dxc/e ()V -MD: net/minecraft/client/renderer/texture/ITextureObject/func_215244_a (Lnet/minecraft/client/renderer/texture/TextureManager;Lnet/minecraft/resources/IResourceManager;Lnet/minecraft/util/ResourceLocation;Ljava/util/concurrent/Executor;)V dxd/a (Ldxc;Lxi;Lqv;Ljava/util/concurrent/Executor;)V -MD: net/minecraft/client/renderer/texture/ITextureObject/func_195413_a (Lnet/minecraft/resources/IResourceManager;)V dxd/a (Lxi;)V -MD: net/minecraft/client/renderer/texture/ITextureObject/func_174935_a ()V dxd/b ()V -MD: net/minecraft/client/renderer/texture/ITextureObject/func_174936_b (ZZ)V dxd/b (ZZ)V -MD: net/minecraft/client/renderer/texture/ITextureObject/func_110552_b ()I dxd/c ()I -MD: net/minecraft/client/renderer/texture/ITextureObject/func_195412_h ()V dxd/h ()V -MD: net/minecraft/client/resources/DefaultPlayerSkin/func_177335_a ()Lnet/minecraft/util/ResourceLocation; dxl/a ()Lqv; -MD: net/minecraft/client/resources/DefaultPlayerSkin/func_177334_a (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; dxl/a (Ljava/util/UUID;)Lqv; -MD: net/minecraft/client/resources/DefaultPlayerSkin/func_177332_b (Ljava/util/UUID;)Ljava/lang/String; dxl/b (Ljava/util/UUID;)Ljava/lang/String; -MD: net/minecraft/client/resources/DefaultPlayerSkin/func_177333_c (Ljava/util/UUID;)Z dxl/c (Ljava/util/UUID;)Z -MD: net/minecraft/client/resources/SkinManager$1/load (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; dxt$1/a (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; -MD: net/minecraft/client/resources/SkinManager$1/load (Ljava/lang/Object;)Ljava/lang/Object; dxt$1/load (Ljava/lang/Object;)Ljava/lang/Object; -MD: net/minecraft/client/resources/SkinManager$2/func_152634_a ()V dxt$2/a ()V -MD: net/minecraft/client/resources/SkinManager$2/func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; dxt$2/a (Lcuj;)Lcuj; -MD: net/minecraft/client/resources/SkinManager$SkinAvailableCallback/onSkinTextureAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V dxt$a/onSkinTextureAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lqv;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V -MD: net/minecraft/client/resources/SkinManager/func_152788_a (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; dxt/a (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; -MD: net/minecraft/client/resources/SkinManager/func_152790_a (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V dxt/a (Lcom/mojang/authlib/GameProfile;Ldxt$a;Z)V -MD: net/minecraft/client/resources/SkinManager/func_210275_a (Lcom/mojang/authlib/GameProfile;ZLnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V dxt/a (Lcom/mojang/authlib/GameProfile;ZLdxt$a;)V -MD: net/minecraft/client/resources/SkinManager/func_152792_a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lnet/minecraft/util/ResourceLocation; dxt/a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;)Lqv; -MD: net/minecraft/client/resources/SkinManager/func_152789_a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; dxt/a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Ldxt$a;)Lqv; -MD: net/minecraft/client/resources/SkinManager/func_210276_a (Ljava/util/Map;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)V dxt/a (Ljava/util/Map;Ldxt$a;)V diff --git a/1.14.4/source/net/minecraft/client/Minecraft.java b/1.14.4/source/net/minecraft/client/Minecraft.java deleted file mode 100644 index 0449b00..0000000 --- a/1.14.4/source/net/minecraft/client/Minecraft.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.minecraft.client; - -import com.mojang.authlib.minecraft.MinecraftSessionService; -import net.minecraft.client.multiplayer.ServerData; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.client.resources.SkinManager; -import net.minecraft.util.Session; - -import java.io.File; - -public class Minecraft { - public File gameDir = null; - - public static Minecraft getMinecraft() { - return null; - } - - public SkinManager getSkinManager() { - return null; - } - - public TextureManager getTextureManager() { - return null; - } - - public MinecraftSessionService getSessionService() { - return null; - } - - public Session getSession() { - return null; - } - - public ServerData getCurrentServerData() { - return null; - } - - public void addScheduledTask(Runnable r) { - } -} diff --git a/BuildScripts/remap.gradle b/BuildScripts/remap.gradle index e50562e..57d065b 100644 --- a/BuildScripts/remap.gradle +++ b/BuildScripts/remap.gradle @@ -13,6 +13,7 @@ buildscript { } } dependencies { + classpath 'net.md-5:SpecialSource:1.8.6' classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' } } diff --git a/Common/resource/BuildInfo.json b/Common/resource/BuildInfo.json index 2dd951c..8b54e76 100644 --- a/Common/resource/BuildInfo.json +++ b/Common/resource/BuildInfo.json @@ -6,5 +6,6 @@ "mcFullVersions": "${mcFullVersions}", "forgeVersion": "${forgeVersion}", "gitVersion": "${gitVersion}", - "buildUrl": "${buildUrl}" + "buildUrl": "${buildUrl}", + "buildTime": "${releaseTime}" } \ No newline at end of file diff --git a/Common/resource/Profile.json b/Common/resource/Profile.json index 42743a0..28f66d6 100644 --- a/Common/resource/Profile.json +++ b/Common/resource/Profile.json @@ -1,24 +1,93 @@ { - "id": "${mcVersion}-CSL-${modShortFullVersion}", - "inheritsFrom": "${mcVersion}", - "jar": "${mcVersion}", - "releaseTime": "2013-01-02T21:10:00+08:00", - "time": "2013-01-02T21:10:00+08:00", - "type": "release", "arguments": { "game": [ "--tweakClass", "customskinloader.tweaker.Tweaker" ] }, - "mainClass": "net.minecraft.launchwrapper.Launch", + "id": "${mcVersion}-CSL-${modShortFullVersion}", + "inheritsFrom": "${mcVersion}", "libraries": [ { - "name": "customskinloader:CustomSkinLoader_${mcVersion}:${modFullVersion}", - "url": "https://csl.littleservice.cn/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}" }, { - "name": "net.minecraft:launchwrapper:1.12" + "downloads": { + "artifact": { + "path": "org/ow2/asm/asm/8.0.1/asm-8.0.1.jar", + "sha1": "3f5199523fb95304b44563f5d56d9f5a07270669", + "size": 121772, + "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm/8.0.1/asm-8.0.1.jar" + } + }, + "name": "org.ow2.asm:asm:8.0.1" + }, + { + "downloads": { + "artifact": { + "path": "org/ow2/asm/asm-analysis/8.0.1/asm-analysis-8.0.1.jar", + "sha1": "6c2c7b3006b3a54dd63467a020263c0756fd5e80", + "size": 33438, + "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-analysis/8.0.1/asm-analysis-8.0.1.jar" + } + }, + "name": "org.ow2.asm:asm-analysis:8.0.1" + }, + { + "downloads": { + "artifact": { + "path": "org/ow2/asm/asm-commons/8.0.1/asm-commons-8.0.1.jar", + "sha1": "019c7ba355f0737815205518e332a8dc08b417c6", + "size": 71563, + "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-commons/8.0.1/asm-commons-8.0.1.jar" + } + }, + "name": "org.ow2.asm:asm-commons:8.0.1" + }, + { + "downloads": { + "artifact": { + "path": "org/ow2/asm/asm-tree/8.0.1/asm-tree-8.0.1.jar", + "sha1": "dfcad5abbcff36f8bdad5647fe6f4972e958ad59", + "size": 52628, + "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-tree/8.0.1/asm-tree-8.0.1.jar" + } + }, + "name": "org.ow2.asm:asm-tree:8.0.1" + }, + { + "downloads": { + "artifact": { + "path": "org/ow2/asm/asm-util/8.0.1/asm-util-8.0.1.jar", + "sha1": "a8f978fbad00c565210bebedb28e5d6f73327134", + "size": 84795, + "url": "https://repo1.maven.org/maven2/org/ow2/asm/asm-util/8.0.1/asm-util-8.0.1.jar" + } + }, + "name": "org.ow2.asm:asm-util:8.0.1" + }, + { + "downloads": { + "artifact": { + "path": "org/spongepowered/mixin/0.8.1-SNAPSHOT/mixin-0.8.1-20200124.185151-1.jar", + "sha1": "c7c000c209a33783cf80f7105032b8d89e1f65d2", + "size": 934746, + "url": "https://repo.spongepowered.org/maven/org/spongepowered/mixin/0.8.1-SNAPSHOT/mixin-0.8.1-20200124.185151-1.jar" + } + }, + "name": "org.spongepowered:mixin:0.8.1-SNAPSHOT" } - ] + ], + "mainClass": "net.minecraft.launchwrapper.Launch", + "releaseTime": "${releaseTime}", + "time": "${releaseTime}", + "type": "release" } \ No newline at end of file diff --git a/Common/source/customskinloader/fake/itf/IFakeMinecraft.java b/Common/source/customskinloader/fake/itf/IFakeMinecraft.java index b54ac81..6af2313 100644 --- a/Common/source/customskinloader/fake/itf/IFakeMinecraft.java +++ b/Common/source/customskinloader/fake/itf/IFakeMinecraft.java @@ -1,17 +1,9 @@ package customskinloader.fake.itf; -import java.util.concurrent.Executor; +import net.minecraft.client.Minecraft; -import com.google.common.util.concurrent.ListenableFuture; - -public interface IFakeMinecraft extends Executor { - default ListenableFuture func_152344_a(Runnable runnable) { - this.execute(runnable); - return null; - } - - @Override +public interface IFakeMinecraft { default void execute(Runnable runnable) { - this.func_152344_a(runnable); + ((Minecraft) this).addScheduledTask(runnable); } } diff --git a/Common/source/net/minecraft/client/renderer/texture/DownloadingTexture.java b/Common/source/net/minecraft/client/renderer/texture/DownloadingTexture.java new file mode 100644 index 0000000..08eca35 --- /dev/null +++ b/Common/source/net/minecraft/client/renderer/texture/DownloadingTexture.java @@ -0,0 +1,16 @@ +package net.minecraft.client.renderer.texture; + +import java.io.File; + +import net.minecraft.client.renderer.IImageBuffer; +import net.minecraft.util.ResourceLocation; + +public class DownloadingTexture extends SimpleTexture { + public DownloadingTexture(File cacheFileIn, String imageUrlIn, ResourceLocation textureResourceLocation, IImageBuffer imageBufferIn) { + super(textureResourceLocation); + } + + public DownloadingTexture(File cacheFileIn, String imageUrlIn, ResourceLocation textureResourceLocation, boolean legacySkinIn, Runnable processTaskIn) { + super(textureResourceLocation); + } +} diff --git a/Common/source/net/minecraft/client/renderer/texture/ThreadDownloadImageData.java b/Common/source/net/minecraft/client/renderer/texture/ThreadDownloadImageData.java new file mode 100644 index 0000000..025804e --- /dev/null +++ b/Common/source/net/minecraft/client/renderer/texture/ThreadDownloadImageData.java @@ -0,0 +1,12 @@ +package net.minecraft.client.renderer.texture; + +import java.io.File; + +import net.minecraft.client.renderer.IImageBuffer; +import net.minecraft.util.ResourceLocation; + +public class ThreadDownloadImageData extends SimpleTexture { + public ThreadDownloadImageData(File cacheFileIn, String imageUrlIn, ResourceLocation textureResourceLocation, IImageBuffer imageBufferIn) { + super(textureResourceLocation); + } +} diff --git a/Fabric/Fabric.srg b/Fabric/Fabric.srg deleted file mode 100644 index c01477b..0000000 --- a/Fabric/Fabric.srg +++ /dev/null @@ -1,57 +0,0 @@ -CL: com/mojang/blaze3d/matrix/MatrixStack net/minecraft/class_4587 -CL: net/minecraft/client/gui/GuiPlayerTabOverlay net/minecraft/class_355 -CL: net/minecraft/client/Minecraft net/minecraft/class_310 -CL: net/minecraft/client/multiplayer/ServerData net/minecraft/class_642 -CL: net/minecraft/client/renderer/IImageBuffer net/minecraft/class_760 -CL: net/minecraft/client/renderer/ThreadDownloadImageData net/minecraft/class_1046 -CL: net/minecraft/client/renderer/texture/ITextureObject net/minecraft/class_1062 -CL: net/minecraft/client/renderer/texture/NativeImage net/minecraft/class_1011 -CL: net/minecraft/client/renderer/texture/SimpleTexture net/minecraft/class_1049 -CL: net/minecraft/client/renderer/texture/Texture net/minecraft/class_1044 -CL: net/minecraft/client/renderer/texture/TextureManager net/minecraft/class_1060 -CL: net/minecraft/client/resources/DefaultPlayerSkin net/minecraft/class_1068 -CL: net/minecraft/client/resources/SkinManager net/minecraft/class_1071 -CL: net/minecraft/client/resources/SkinManager$SkinAvailableCallback net/minecraft/class_1071$class_1072 -CL: net/minecraft/scoreboard/ScoreObjective net/minecraft/class_266 -CL: net/minecraft/scoreboard/Scoreboard net/minecraft/class_269 -CL: net/minecraft/tileentity/TileEntitySkull net/minecraft/class_2631 -CL: net/minecraft/util/ResourceLocation net/minecraft/class_2960 -CL: net/minecraft/util/Session net/minecraft/class_320 -CL: net/minecraft/util/StringUtils net/minecraft/class_3544 -FD: net/minecraft/client/Minecraft/field_71412_D net/minecraft/class_310/field_1697 -FD: net/minecraft/client/multiplayer/ServerData/field_78845_b net/minecraft/class_642/field_3761 -FD: net/minecraft/client/renderer/ThreadDownloadImageData/processTask net/minecraft/class_1046/field_20843 -MD: customskinloader/fake/itf/IFakeTextureManager_1/func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)Z customskinloader/fake/itf/IFakeTextureManager_1/method_4616 (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)Z -MD: customskinloader/fake/itf/IFakeTextureManager_1/func_229267_b_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/Texture; customskinloader/fake/itf/IFakeTextureManager_1/method_4619 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1044; -MD: customskinloader/fake/itf/IFakeTextureManager_2/func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)V customskinloader/fake/itf/IFakeTextureManager_2/method_4616 (Lnet/minecraft/class_2960;Lnet/minecraft/class_1044;)V -MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V net/minecraft/class_355/method_1919 (ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V -MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V net/minecraft/class_355/method_1919 (Lnet/minecraft/class_4587;ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V -MD: net/minecraft/client/Minecraft/func_110432_I ()Lnet/minecraft/util/Session; net/minecraft/class_310/method_1548 ()Lnet/minecraft/class_320; -MD: net/minecraft/client/Minecraft/func_110434_K ()Lnet/minecraft/client/renderer/texture/TextureManager; net/minecraft/class_310/method_1531 ()Lnet/minecraft/class_1060; -MD: net/minecraft/client/Minecraft/func_147104_D ()Lnet/minecraft/client/multiplayer/ServerData; net/minecraft/class_310/method_1558 ()Lnet/minecraft/class_642; -MD: net/minecraft/client/Minecraft/func_152342_ad ()Lnet/minecraft/client/resources/SkinManager; net/minecraft/class_310/method_1582 ()Lnet/minecraft/class_1071; -MD: net/minecraft/client/Minecraft/func_152347_ac ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; net/minecraft/class_310/method_1495 ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; -MD: net/minecraft/client/Minecraft/func_71410_x ()Lnet/minecraft/client/Minecraft; net/minecraft/class_310/method_1551 ()Lnet/minecraft/class_310; -MD: net/minecraft/client/Minecraft/isIntegratedServerRunning ()Z net/minecraft/class_310/method_1542 ()Z -MD: net/minecraft/client/renderer/IImageBuffer/func_152634_a ()V net/minecraft/class_760/method_3238 ()V -MD: net/minecraft/client/renderer/IImageBuffer/func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; net/minecraft/class_760/method_3237 (Lnet/minecraft/class_1011;)Lnet/minecraft/class_1011; -MD: net/minecraft/client/renderer/ThreadDownloadImageData/loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; net/minecraft/class_1046/method_22795 (Ljava/io/InputStream;)Lnet/minecraft/class_1011; -MD: net/minecraft/client/renderer/ThreadDownloadImageData/processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; net/minecraft/class_1046/method_22798 (Lnet/minecraft/class_1011;)Lnet/minecraft/class_1011; -MD: net/minecraft/client/renderer/texture/NativeImage/func_195699_a (IIIIIIZZ)V net/minecraft/class_1011/method_4304 (IIIIIIZZ)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195700_a (III)V net/minecraft/class_1011/method_4305 (III)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195702_a ()I net/minecraft/class_1011/method_4307 ()I -MD: net/minecraft/client/renderer/texture/NativeImage/func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V net/minecraft/class_1011/method_4317 (Lnet/minecraft/class_1011;)V -MD: net/minecraft/client/renderer/texture/NativeImage/func_195709_a (II)I net/minecraft/class_1011/method_4315 (II)I -MD: net/minecraft/client/renderer/texture/NativeImage/func_195714_b ()I net/minecraft/class_1011/method_4323 ()I -MD: net/minecraft/client/renderer/texture/NativeImage/func_195715_a (IIIII)V net/minecraft/class_1011/method_4326 (IIIII)V -MD: net/minecraft/client/renderer/texture/TextureManager/func_110579_a (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z net/minecraft/class_1060/method_4616 (Lnet/minecraft/class_2960;Lnet/minecraft/class_1062;)Z -MD: net/minecraft/client/renderer/texture/TextureManager/func_110581_b (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; net/minecraft/class_1060/method_4619 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1062; -MD: net/minecraft/client/resources/DefaultPlayerSkin/func_177334_a (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; net/minecraft/class_1068/method_4648 (Ljava/util/UUID;)Lnet/minecraft/class_2960; -MD: net/minecraft/client/resources/DefaultPlayerSkin/func_177335_a ()Lnet/minecraft/util/ResourceLocation; net/minecraft/class_1068/method_4649 ()Lnet/minecraft/class_2960; -MD: net/minecraft/client/resources/SkinManager/loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V net/minecraft/class_1071/method_4652 (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_1071$class_1072;Z)V -MD: net/minecraft/client/resources/SkinManager/loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; net/minecraft/class_1071/method_4651 (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_1071$class_1072;)Lnet/minecraft/class_2960; -MD: net/minecraft/client/resources/SkinManager/loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; net/minecraft/class_1071/method_4654 (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; -MD: net/minecraft/client/resources/SkinManager$SkinAvailableCallback/func_180521_a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V net/minecraft/class_1071$class_1072/onSkinTextureAvailable (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_2960;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V -MD: net/minecraft/tileentity/TileEntitySkull/updateGameProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; net/minecraft/class_2631/method_11335 (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; -MD: net/minecraft/util/Session/func_148256_e ()Lcom/mojang/authlib/GameProfile; net/minecraft/class_320/method_1677 ()Lcom/mojang/authlib/GameProfile; -MD: net/minecraft/util/StringUtils/func_76338_a (Ljava/lang/String;)Ljava/lang/String; net/minecraft/class_3544/method_15440 (Ljava/lang/String;)Ljava/lang/String; \ No newline at end of file diff --git a/Fabric/Fabric.tsrg b/Fabric/Fabric.tsrg new file mode 100644 index 0000000..5910b9c --- /dev/null +++ b/Fabric/Fabric.tsrg @@ -0,0 +1,50 @@ +customskinloader/fake/itf/IFakeTextureManager_1 customskinloader/fake/itf/IFakeTextureManager_1 + func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)Z method_4616 + func_229267_b_ (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/Texture; method_4619 +customskinloader/fake/itf/IFakeTextureManager_2 customskinloader/fake/itf/IFakeTextureManager_2 + func_229263_a_ (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/Texture;)V method_4616 +net/minecraft/client/gui/GuiPlayerTabOverlay net/minecraft/class_355 +net/minecraft/client/gui/spectator/PlayerMenuObject net/minecraft/class_530 +net/minecraft/client/Minecraft net/minecraft/class_310 + field_71412_D field_1697 + func_110432_I ()Lnet/minecraft/util/Session; method_1548 + func_110434_K ()Lnet/minecraft/client/renderer/texture/TextureManager; method_1531 + func_147104_D ()Lnet/minecraft/client/multiplayer/ServerData; method_1558 + func_152342_ad ()Lnet/minecraft/client/resources/SkinManager; method_1582 + func_152347_ac ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; method_1495 + func_71410_x ()Lnet/minecraft/client/Minecraft; method_1551 +net/minecraft/client/multiplayer/ServerData net/minecraft/class_642 + field_78845_b field_3761 +net/minecraft/client/renderer/IImageBuffer net/minecraft/class_760 + func_152634_a ()V method_3238 + func_195786_a (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; method_3237 +net/minecraft/client/renderer/ThreadDownloadImageData net/minecraft/class_1046 +net/minecraft/client/renderer/texture/DownloadingTexture net/minecraft/class_1046 +net/minecraft/client/renderer/texture/ITextureObject net/minecraft/class_1062 +net/minecraft/client/renderer/texture/NativeImage net/minecraft/class_1011 + func_195699_a (IIIIIIZZ)V method_4304 + func_195700_a (III)V method_4305 + func_195702_a ()I method_4307 + func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V method_4317 + func_195709_a (II)I method_4315 + func_195714_b ()I method_4323 + func_195715_a (IIIII)V method_4326 +net/minecraft/client/renderer/texture/SimpleTexture net/minecraft/class_1049 +net/minecraft/client/renderer/texture/Texture net/minecraft/class_1044 +net/minecraft/client/renderer/texture/TextureManager net/minecraft/class_1060 + func_110579_a (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z method_4616 + func_110581_b (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; method_4619 +net/minecraft/client/renderer/texture/ThreadDownloadImageData net/minecraft/class_1046 +net/minecraft/client/resources/DefaultPlayerSkin net/minecraft/class_1068 + func_177334_a (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; method_4648 + func_177335_a ()Lnet/minecraft/util/ResourceLocation; method_4649 +net/minecraft/client/resources/SkinManager net/minecraft/class_1071 + func_152790_a (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V method_4652 +net/minecraft/client/resources/SkinManager$SkinAvailableCallback net/minecraft/class_1071$class_1072 + func_180521_a (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 + func_148256_e ()Lcom/mojang/authlib/GameProfile; method_1677 +net/minecraft/util/StringUtils net/minecraft/class_3544 + func_76338_a (Ljava/lang/String;)Ljava/lang/String; method_15440 \ No newline at end of file diff --git a/Fabric/build.gradle b/Fabric/build.gradle index b6d0d3d..31f0a23 100644 --- a/Fabric/build.gradle +++ b/Fabric/build.gradle @@ -30,6 +30,7 @@ minecraft { } jar { + exclude 'customskinloader/tweaker/**' exclude 'net/minecraft/client/renderer/texture/**' } @@ -41,29 +42,31 @@ repositories { } dependencies { - implementation 'org.spongepowered:mixin:0.8-SNAPSHOT' + implementation 'org.spongepowered:mixin:0.8' } mixin { add sourceSets.main, "mixins.customskinloader.refmap.json" - reobfSrgFile = config.srg_notch_map - reobfNotchSrgFile = config.srg_notch_map + reobfSrgFile = "mixin.srg" + reobfNotchSrgFile = "mixin.srg" } sourceSets { main { java { //Common - srcDir '../Common/source' + srcDir "${rootDir}/Common/source" + //Vanilla + srcDir "${rootDir}/Vanilla/source" //Fabric - srcDir 'source' + srcDir "source" } resources { //Common - srcDir '../Common/resource' - exclude 'Profile.json' + srcDir "${rootDir}/Common/resource" + exclude "Profile.json" //Fabric - srcDir 'resource' + srcDir "resource" } } } @@ -77,7 +80,8 @@ processResources { mcFullVersions : config.minecraft_full_versions, forgeVersion : config.forge_version, gitVersion : System.getenv("CIRCLE_SHA1"), - buildUrl : System.getenv("CIRCLE_BUILD_URL") + buildUrl : System.getenv("CIRCLE_BUILD_URL"), + releaseTime : new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } @@ -94,12 +98,12 @@ task afterBuild { //copyBuildFile copy { - from 'build/libs' - into '../build/libs' - include '**/*.jar' - exclude '**/*-dev.jar' - exclude '**/*-srg.jar' - exclude '**/*-sources.jar' + from "build/libs" + into "${rootDir}/build/libs" + include "**/*.jar" + exclude "**/*-srg.jar" + exclude "**/*-dev.jar" + exclude "**/*-sources.jar" } } } diff --git a/Fabric/build.properties b/Fabric/build.properties index e8e0763..5adc05a 100644 --- a/Fabric/build.properties +++ b/Fabric/build.properties @@ -4,4 +4,4 @@ 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 forge_mc_version=1.12.2 forge_version=14.23.5.2768 mappings_version=stable_39 -srg_notch_map=Fabric.srg \ No newline at end of file +srg_notch_map=Fabric.tsrg \ No newline at end of file diff --git a/Fabric/mixin.srg b/Fabric/mixin.srg new file mode 100644 index 0000000..5a8b17c --- /dev/null +++ b/Fabric/mixin.srg @@ -0,0 +1,25 @@ +CL: com/mojang/blaze3d/matrix/MatrixStack net/minecraft/class_4587 +CL: net/minecraft/client/entity/AbstractClientPlayer net/minecraft/class_742 +CL: net/minecraft/client/gui/GuiPlayerTabOverlay net/minecraft/class_355 +CL: net/minecraft/client/Minecraft net/minecraft/class_310 +CL: net/minecraft/client/renderer/ThreadDownloadImageData net/minecraft/class_1046 +CL: net/minecraft/client/renderer/texture/NativeImage net/minecraft/class_1011 +CL: net/minecraft/client/renderer/texture/TextureManager net/minecraft/class_1060 +CL: net/minecraft/client/resources/SkinManager net/minecraft/class_1071 +CL: net/minecraft/client/resources/SkinManager$SkinAvailableCallback net/minecraft/class_1071$class_1072 +CL: net/minecraft/scoreboard/ScoreObjective net/minecraft/class_266 +CL: net/minecraft/scoreboard/Scoreboard net/minecraft/class_269 +CL: net/minecraft/tileentity/TileEntitySkull net/minecraft/class_2631 +CL: net/minecraft/util/ResourceLocation net/minecraft/class_2960 +FD: net/minecraft/client/renderer/ThreadDownloadImageData/processTask net/minecraft/class_1046/field_20843 +MD: net/minecraft/client/entity/AbstractClientPlayer/getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; net/minecraft/class_742/method_3120 (Lnet/minecraft/class_2960;Ljava/lang/String;)Lnet/minecraft/class_1046; +MD: net/minecraft/client/entity/AbstractClientPlayer/getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; net/minecraft/class_742/method_3124 (Ljava/lang/String;)Lnet/minecraft/class_2960; +MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V net/minecraft/class_355/method_1919 (ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V +MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V net/minecraft/class_355/method_1919 (Lnet/minecraft/class_4587;ILnet/minecraft/class_269;Lnet/minecraft/class_266;)V +MD: net/minecraft/client/Minecraft/isIntegratedServerRunning ()Z net/minecraft/class_310/method_1542 ()Z +MD: net/minecraft/client/renderer/ThreadDownloadImageData/loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; net/minecraft/class_1046/method_22795 (Ljava/io/InputStream;)Lnet/minecraft/class_1011; +MD: net/minecraft/client/renderer/ThreadDownloadImageData/processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; net/minecraft/class_1046/method_22798 (Lnet/minecraft/class_1011;)Lnet/minecraft/class_1011; +MD: net/minecraft/client/resources/SkinManager/loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V net/minecraft/class_1071/method_4652 (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_1071$class_1072;Z)V +MD: net/minecraft/client/resources/SkinManager/loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; net/minecraft/class_1071/method_4651 (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/class_1071$class_1072;)Lnet/minecraft/class_2960; +MD: net/minecraft/client/resources/SkinManager/loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; net/minecraft/class_1071/method_4654 (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; +MD: net/minecraft/tileentity/TileEntitySkull/updateGameProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; net/minecraft/class_2631/method_11335 (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; diff --git a/Fabric/resource/mixins.customskinloader.json b/Fabric/resource/mixins.customskinloader.json index eb3f9cf..d1a4822 100644 --- a/Fabric/resource/mixins.customskinloader.json +++ b/Fabric/resource/mixins.customskinloader.json @@ -1,6 +1,6 @@ { "compatibilityLevel": "JAVA_8", - "package": "customskinloader.fabric.mixin", + "package": "customskinloader.mixin", "client": [ "MixinGuiPlayerTabOverlay", "MixinMinecraft", diff --git a/Forge/build.gradle b/Forge/build.gradle index e193aab..e4a5fe2 100644 --- a/Forge/build.gradle +++ b/Forge/build.gradle @@ -50,16 +50,16 @@ sourceSets { main { java { //Common - srcDir '../Common/source' + srcDir "${rootDir}/Common/source" //Forge - srcDir 'source' + srcDir "source" } resources { //Common - srcDir '../Common/resource' - exclude 'Profile.json' + srcDir "${rootDir}/Common/resource" + exclude "Profile.json" //Forge - srcDir 'resource' + srcDir "resource" } } } @@ -85,7 +85,8 @@ processResources { mcFullVersions: config.minecraft_full_versions, forgeVersion : config.forge_version, gitVersion : System.getenv("CIRCLE_SHA1"), - buildUrl : System.getenv("CIRCLE_BUILD_URL") + buildUrl : System.getenv("CIRCLE_BUILD_URL"), + releaseTime : new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ])} } @@ -107,10 +108,10 @@ task afterBuild { doLast { //copyBuildFile copy { - from 'build/libs' - into '../build/libs' - include '**/*.jar' - exclude '**/*-sources.jar' + from "build/libs" + into "${rootDir}/build/libs" + include "**/*.jar" + exclude "**/*-sources.jar" } } } diff --git a/Vanilla/1.12.2/1.12.2.tsrg b/Vanilla/1.12.2/1.12.2.tsrg new file mode 100644 index 0000000..5b7db92 --- /dev/null +++ b/Vanilla/1.12.2/1.12.2.tsrg @@ -0,0 +1,38 @@ +net/minecraft/client/gui/GuiPlayerTabOverlay bjq +net/minecraft/client/gui/spectator/PlayerMenuObject boo +net/minecraft/client/Minecraft bib + field_71412_D w + func_110432_I ()Lnet/minecraft/util/Session; K + func_110434_K ()Lnet/minecraft/client/renderer/texture/TextureManager; N + func_147104_D ()Lnet/minecraft/client/multiplayer/ServerData; C + func_152342_ad ()Lnet/minecraft/client/resources/SkinManager; Y + func_152344_a (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; a + func_152347_ac ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; X + func_71410_x ()Lnet/minecraft/client/Minecraft; z +net/minecraft/client/multiplayer/ServerData bse + field_78845_b b +net/minecraft/client/renderer/IImageBuffer but + func_152634_a ()V a + func_78432_a (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; a +net/minecraft/client/renderer/ThreadDownloadImageData cdh +net/minecraft/client/renderer/texture/DownloadingTexture cdh +net/minecraft/client/renderer/texture/ITextureObject cds +net/minecraft/client/renderer/texture/SimpleTexture cdm +net/minecraft/client/renderer/texture/Texture cdf +net/minecraft/client/renderer/texture/TextureManager cdr + func_110579_a (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z a + func_110581_b (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; b +net/minecraft/client/renderer/texture/ThreadDownloadImageData cdh +net/minecraft/client/resources/DefaultPlayerSkin cef + func_177334_a (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a + func_177335_a ()Lnet/minecraft/util/ResourceLocation; a +net/minecraft/client/resources/SkinManager cex + func_152790_a (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a +net/minecraft/client/resources/SkinManager$SkinAvailableCallback cex$a + func_180521_a (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 + func_148256_e ()Lcom/mojang/authlib/GameProfile; e +net/minecraft/util/StringUtils rp + func_76338_a (Ljava/lang/String;)Ljava/lang/String; a \ No newline at end of file diff --git a/Vanilla/1.12.2/build.properties b/Vanilla/1.12.2/build.properties new file mode 100644 index 0000000..46abf38 --- /dev/null +++ b/Vanilla/1.12.2/build.properties @@ -0,0 +1,7 @@ +minecraft_version=1.12.2 +minecraft_full_versions=1.12.2 +#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 \ No newline at end of file diff --git a/Vanilla/1.12.2/mixin.srg b/Vanilla/1.12.2/mixin.srg new file mode 100644 index 0000000..91c1fa3 --- /dev/null +++ b/Vanilla/1.12.2/mixin.srg @@ -0,0 +1,24 @@ +CL: net/minecraft/client/entity/AbstractClientPlayer bua +CL: net/minecraft/client/gui/GuiPlayerTabOverlay bjq +CL: net/minecraft/client/gui/spectator/PlayerMenuObject boo +CL: net/minecraft/client/Minecraft bib +CL: net/minecraft/client/renderer/ThreadDownloadImageData cdh +CL: net/minecraft/client/renderer/texture/TextureManager cdr +CL: net/minecraft/client/resources/SkinManager cex +CL: net/minecraft/client/resources/SkinManager$SkinAvailableCallback cex$a +CL: net/minecraft/scoreboard/ScoreObjective bhg +CL: net/minecraft/scoreboard/Scoreboard bhk +CL: net/minecraft/tileentity/TileEntitySkull awd +CL: net/minecraft/util/ResourceLocation nf +FD: net/minecraft/client/renderer/ThreadDownloadImageData/processTask cdh/field_229155_i_ +MD: net/minecraft/client/entity/AbstractClientPlayer/getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; bua/a (Lnf;Ljava/lang/String;)Lcdh; +MD: net/minecraft/client/entity/AbstractClientPlayer/getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; bua/e (Ljava/lang/String;)Lnf; +MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V bjq/a (ILbhk;Lbhg;)V +MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V bjq/func_238523_a_ (Lcom/mojang/blaze3d/matrix/MatrixStack;ILbhk;Lbhg;)V +MD: net/minecraft/client/Minecraft/isIntegratedServerRunning ()Z bib/D ()Z +MD: net/minecraft/client/renderer/ThreadDownloadImageData/loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; cdh/func_229159_a_ (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; +MD: net/minecraft/client/renderer/ThreadDownloadImageData/processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; cdh/func_229163_c_ (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; +MD: net/minecraft/client/resources/SkinManager/loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V cex/a (Lcom/mojang/authlib/GameProfile;Lcex$a;Z)V +MD: net/minecraft/client/resources/SkinManager/loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; cex/a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lcex$a;)Lnf; +MD: net/minecraft/client/resources/SkinManager/loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; cex/a (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; +MD: net/minecraft/tileentity/TileEntitySkull/updateGameProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; awd/b (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; \ No newline at end of file diff --git a/Vanilla/1.12.2/resource/mixins.customskinloader.json b/Vanilla/1.12.2/resource/mixins.customskinloader.json new file mode 100644 index 0000000..c48be13 --- /dev/null +++ b/Vanilla/1.12.2/resource/mixins.customskinloader.json @@ -0,0 +1,16 @@ +{ + "compatibilityLevel": "JAVA_8", + "package": "customskinloader.mixin", + "client": [ + "MixinGuiPlayerTabOverlay", + "MixinMinecraft", + "MixinPlayerMenuObject", + "MixinSkinManager", + "MixinTextureManager", + "MixinTileEntitySkull" + ], + "refmap": "mixins.customskinloader.refmap.json", + "injectors": { + "defaultRequire": 1 + } +} diff --git a/Vanilla/1.15.2/1.15.2.tsrg b/Vanilla/1.15.2/1.15.2.tsrg new file mode 100644 index 0000000..f173d4e --- /dev/null +++ b/Vanilla/1.15.2/1.15.2.tsrg @@ -0,0 +1,43 @@ +customskinloader/fake/itf/IFakeTextureManager_1 customskinloader/fake/itf/IFakeTextureManager_1 + func_229267_b_ (Lnet/minecraft/util/ResourceLocation;)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/gui/GuiPlayerTabOverlay ddj +net/minecraft/client/gui/spectator/PlayerMenuObject djn +net/minecraft/client/Minecraft dbn + field_71412_D m + func_110432_I ()Lnet/minecraft/util/Session; E + func_110434_K ()Lnet/minecraft/client/renderer/texture/TextureManager; H + func_147104_D ()Lnet/minecraft/client/multiplayer/ServerData; z + func_152342_ad ()Lnet/minecraft/client/resources/SkinManager; S + func_152347_ac ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; R + func_71410_x ()Lnet/minecraft/client/Minecraft; x +net/minecraft/client/multiplayer/ServerData dnu + field_78845_b b +net/minecraft/client/renderer/ThreadDownloadImageData dzz +net/minecraft/client/renderer/texture/DownloadingTexture dzz +net/minecraft/client/renderer/texture/NativeImage cxr + func_195699_a (IIIIIIZZ)V a + func_195700_a (III)V a + func_195702_a ()I a + func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V a + func_195709_a (II)I a + func_195714_b ()I b + func_195715_a (IIIII)V a +net/minecraft/client/renderer/texture/SimpleTexture eaf +net/minecraft/client/renderer/texture/Texture dzw +net/minecraft/client/renderer/texture/TextureManager eak +net/minecraft/client/renderer/texture/ThreadDownloadImageData dzz +net/minecraft/client/resources/DefaultPlayerSkin eaq + func_177334_a (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a + func_177335_a ()Lnet/minecraft/util/ResourceLocation; a +net/minecraft/client/resources/SkinManager eaz + func_152790_a (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a +net/minecraft/client/resources/SkinManager$SkinAvailableCallback eaz$a + func_180521_a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable +net/minecraft/tileentity/TileEntitySkull bxi +net/minecraft/util/ResourceLocation sm +net/minecraft/util/Session dbz + func_148256_e ()Lcom/mojang/authlib/GameProfile; e +net/minecraft/util/StringUtils aby + func_76338_a (Ljava/lang/String;)Ljava/lang/String; a \ No newline at end of file diff --git a/Vanilla/1.15.2/build.properties b/Vanilla/1.15.2/build.properties new file mode 100644 index 0000000..0ada52b --- /dev/null +++ b/Vanilla/1.15.2/build.properties @@ -0,0 +1,7 @@ +minecraft_version=1.15.2 +minecraft_full_versions=1.15.2 +#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.15.2.tsrg \ No newline at end of file diff --git a/Vanilla/1.15.2/mixin.srg b/Vanilla/1.15.2/mixin.srg new file mode 100644 index 0000000..dc899f4 --- /dev/null +++ b/Vanilla/1.15.2/mixin.srg @@ -0,0 +1,25 @@ +CL: com/mojang/blaze3d/matrix/MatrixStack cyl +CL: net/minecraft/client/entity/AbstractClientPlayer dpy +CL: net/minecraft/client/gui/GuiPlayerTabOverlay ddj +CL: net/minecraft/client/Minecraft dbn +CL: net/minecraft/client/renderer/ThreadDownloadImageData dzz +CL: net/minecraft/client/renderer/texture/NativeImage cxr +CL: net/minecraft/client/renderer/texture/TextureManager eak +CL: net/minecraft/client/resources/SkinManager eaz +CL: net/minecraft/client/resources/SkinManager$SkinAvailableCallback eaz$a +CL: net/minecraft/scoreboard/ScoreObjective cwi +CL: net/minecraft/scoreboard/Scoreboard cwl +CL: net/minecraft/tileentity/TileEntitySkull bxi +CL: net/minecraft/util/ResourceLocation sm +FD: net/minecraft/client/renderer/ThreadDownloadImageData/processTask dzz/i +MD: net/minecraft/client/entity/AbstractClientPlayer/getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; dpy/a (Lsm;Ljava/lang/String;)Ldzz; +MD: net/minecraft/client/entity/AbstractClientPlayer/getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; dpy/d (Ljava/lang/String;)Lsm; +MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V ddj/a (ILcwl;Lcwi;)V +MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V ddj/func_238523_a_ (Lcyl;ILbhk;Lbhg;)V +MD: net/minecraft/client/Minecraft/isIntegratedServerRunning ()Z dbn/A ()Z +MD: net/minecraft/client/renderer/ThreadDownloadImageData/loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; dzz/a (Ljava/io/InputStream;)Lcxr; +MD: net/minecraft/client/renderer/ThreadDownloadImageData/processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; dzz/c (Lcxr;)Lcxr; +MD: net/minecraft/client/resources/SkinManager/loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V eaz/a (Lcom/mojang/authlib/GameProfile;Leaz$a;Z)V +MD: net/minecraft/client/resources/SkinManager/loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; eaz/a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Leaz$a;)Lsm; +MD: net/minecraft/client/resources/SkinManager/loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; eaz/a (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; +MD: net/minecraft/tileentity/TileEntitySkull/updateGameProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; bxi/b (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; \ No newline at end of file diff --git a/Vanilla/1.15.2/resource/mixins.customskinloader.json b/Vanilla/1.15.2/resource/mixins.customskinloader.json new file mode 100644 index 0000000..d1a4822 --- /dev/null +++ b/Vanilla/1.15.2/resource/mixins.customskinloader.json @@ -0,0 +1,16 @@ +{ + "compatibilityLevel": "JAVA_8", + "package": "customskinloader.mixin", + "client": [ + "MixinGuiPlayerTabOverlay", + "MixinMinecraft", + "MixinSkinManager", + "MixinTextureManager", + "MixinThreadDownloadImageData", + "MixinTileEntitySkull" + ], + "refmap": "mixins.customskinloader.refmap.json", + "injectors": { + "defaultRequire": 1 + } +} diff --git a/Vanilla/1.16.1/1.16.1.tsrg b/Vanilla/1.16.1/1.16.1.tsrg new file mode 100644 index 0000000..5d4da05 --- /dev/null +++ b/Vanilla/1.16.1/1.16.1.tsrg @@ -0,0 +1,43 @@ +customskinloader/fake/itf/IFakeTextureManager_1 customskinloader/fake/itf/IFakeTextureManager_1 + func_229267_b_ (Lnet/minecraft/util/ResourceLocation;)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/gui/GuiPlayerTabOverlay dnw +net/minecraft/client/gui/spectator/PlayerMenuObject duh +net/minecraft/client/Minecraft dlx + field_71412_D n + func_110432_I ()Lnet/minecraft/util/Session; I + func_110434_K ()Lnet/minecraft/client/renderer/texture/TextureManager; L + func_147104_D ()Lnet/minecraft/client/multiplayer/ServerData; D + func_152342_ad ()Lnet/minecraft/client/resources/SkinManager; Y + func_152347_ac ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; X + func_71410_x ()Lnet/minecraft/client/Minecraft; B +net/minecraft/client/multiplayer/ServerData dys + field_78845_b b +net/minecraft/client/renderer/ThreadDownloadImageData elm +net/minecraft/client/renderer/texture/DownloadingTexture elm +net/minecraft/client/renderer/texture/NativeImage dgs + func_195699_a (IIIIIIZZ)V a + func_195700_a (III)V a + func_195702_a ()I a + func_195703_a (Lnet/minecraft/client/renderer/texture/NativeImage;)V a + func_195709_a (II)I a + func_195714_b ()I b + func_195715_a (IIIII)V a +net/minecraft/client/renderer/texture/SimpleTexture elr +net/minecraft/client/renderer/texture/Texture elj +net/minecraft/client/renderer/texture/TextureManager elw +net/minecraft/client/renderer/texture/ThreadDownloadImageData elm +net/minecraft/client/resources/DefaultPlayerSkin emc + func_177334_a (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a + func_177335_a ()Lnet/minecraft/util/ResourceLocation; a +net/minecraft/client/resources/SkinManager emm + func_152790_a (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a +net/minecraft/client/resources/SkinManager$SkinAvailableCallback emm$a + func_180521_a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/util/ResourceLocation;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;)V onSkinTextureAvailable +net/minecraft/tileentity/TileEntitySkull cei +net/minecraft/util/ResourceLocation uh +net/minecraft/util/Session dml + func_148256_e ()Lcom/mojang/authlib/GameProfile; e +net/minecraft/util/StringUtils aei + func_76338_a (Ljava/lang/String;)Ljava/lang/String; a \ No newline at end of file diff --git a/Vanilla/1.16.1/build.properties b/Vanilla/1.16.1/build.properties new file mode 100644 index 0000000..474fc80 --- /dev/null +++ b/Vanilla/1.16.1/build.properties @@ -0,0 +1,7 @@ +minecraft_version=1.16.1 +minecraft_full_versions=1.16.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.16.1.tsrg \ No newline at end of file diff --git a/Vanilla/1.16.1/mixin.srg b/Vanilla/1.16.1/mixin.srg new file mode 100644 index 0000000..416b0bb --- /dev/null +++ b/Vanilla/1.16.1/mixin.srg @@ -0,0 +1,25 @@ +CL: com/mojang/blaze3d/matrix/MatrixStack dhl +CL: net/minecraft/client/entity/AbstractClientPlayer ebc +CL: net/minecraft/client/gui/GuiPlayerTabOverlay dnw +CL: net/minecraft/client/Minecraft dlx +CL: net/minecraft/client/renderer/ThreadDownloadImageData elm +CL: net/minecraft/client/renderer/texture/NativeImage dgs +CL: net/minecraft/client/renderer/texture/TextureManager elw +CL: net/minecraft/client/resources/SkinManager emm +CL: net/minecraft/client/resources/SkinManager$SkinAvailableCallback emm$a +CL: net/minecraft/scoreboard/ScoreObjective dfj +CL: net/minecraft/scoreboard/Scoreboard dfm +CL: net/minecraft/tileentity/TileEntitySkull cei +CL: net/minecraft/util/ResourceLocation uh +FD: net/minecraft/client/renderer/ThreadDownloadImageData/processTask elm/i +MD: net/minecraft/client/entity/AbstractClientPlayer/getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; ebc/a (Luh;Ljava/lang/String;)Lelm; +MD: net/minecraft/client/entity/AbstractClientPlayer/getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; ebc/d (Ljava/lang/String;)Luh; +MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V dnw/func_175249_a (ILcwl;Lcwi;)V +MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V dnw/a (Ldhl;ILdfm;Ldfj;)V +MD: net/minecraft/client/Minecraft/isIntegratedServerRunning ()Z dlx/E ()Z +MD: net/minecraft/client/renderer/ThreadDownloadImageData/loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; elm/a (Ljava/io/InputStream;)Ldgs; +MD: net/minecraft/client/renderer/ThreadDownloadImageData/processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; elm/c (Ldgs;)Ldgs; +MD: net/minecraft/client/resources/SkinManager/loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V emm/a (Lcom/mojang/authlib/GameProfile;Lemm$a;Z)V +MD: net/minecraft/client/resources/SkinManager/loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; emm/a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lemm$a;)Luh; +MD: net/minecraft/client/resources/SkinManager/loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; emm/a (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; +MD: net/minecraft/tileentity/TileEntitySkull/updateGameProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; cei/b (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; \ No newline at end of file diff --git a/Vanilla/1.16.1/resource/mixins.customskinloader.json b/Vanilla/1.16.1/resource/mixins.customskinloader.json new file mode 100644 index 0000000..d1a4822 --- /dev/null +++ b/Vanilla/1.16.1/resource/mixins.customskinloader.json @@ -0,0 +1,16 @@ +{ + "compatibilityLevel": "JAVA_8", + "package": "customskinloader.mixin", + "client": [ + "MixinGuiPlayerTabOverlay", + "MixinMinecraft", + "MixinSkinManager", + "MixinTextureManager", + "MixinThreadDownloadImageData", + "MixinTileEntitySkull" + ], + "refmap": "mixins.customskinloader.refmap.json", + "injectors": { + "defaultRequire": 1 + } +} diff --git a/Vanilla/1.8.9/1.8.9.tsrg b/Vanilla/1.8.9/1.8.9.tsrg new file mode 100644 index 0000000..83be592 --- /dev/null +++ b/Vanilla/1.8.9/1.8.9.tsrg @@ -0,0 +1,38 @@ +net/minecraft/client/gui/GuiPlayerTabOverlay awh +net/minecraft/client/gui/spectator/PlayerMenuObject bad +net/minecraft/client/Minecraft ave + field_71412_D v + func_110432_I ()Lnet/minecraft/util/Session; L + func_110434_K ()Lnet/minecraft/client/renderer/texture/TextureManager; P + func_147104_D ()Lnet/minecraft/client/multiplayer/ServerData; D + func_152342_ad ()Lnet/minecraft/client/resources/SkinManager; ab + func_152344_a (Ljava/lang/Runnable;)Lcom/google/common/util/concurrent/ListenableFuture; a + func_152347_ac ()Lcom/mojang/authlib/minecraft/MinecraftSessionService; aa + func_71410_x ()Lnet/minecraft/client/Minecraft; A +net/minecraft/client/multiplayer/ServerData bde + field_78845_b b +net/minecraft/client/renderer/IImageBuffer bfm + func_152634_a ()V a + func_78432_a (Ljava/awt/image/BufferedImage;)Ljava/awt/image/BufferedImage; a +net/minecraft/client/renderer/ThreadDownloadImageData bma +net/minecraft/client/renderer/texture/DownloadingTexture bma +net/minecraft/client/renderer/texture/ITextureObject bmk +net/minecraft/client/renderer/texture/SimpleTexture bme +net/minecraft/client/renderer/texture/Texture bly +net/minecraft/client/renderer/texture/TextureManager bmj + func_110579_a (Lnet/minecraft/util/ResourceLocation;Lnet/minecraft/client/renderer/texture/ITextureObject;)Z a + func_110581_b (Lnet/minecraft/util/ResourceLocation;)Lnet/minecraft/client/renderer/texture/ITextureObject; b +net/minecraft/client/renderer/texture/ThreadDownloadImageData bma +net/minecraft/client/resources/DefaultPlayerSkin bmz + func_177334_a (Ljava/util/UUID;)Lnet/minecraft/util/ResourceLocation; a + func_177335_a ()Lnet/minecraft/util/ResourceLocation; a +net/minecraft/client/resources/SkinManager bnp + func_152790_a (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V a +net/minecraft/client/resources/SkinManager$SkinAvailableCallback bnp$a + func_180521_a (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 + func_148256_e ()Lcom/mojang/authlib/GameProfile; e +net/minecraft/util/StringUtils nx + func_76338_a (Ljava/lang/String;)Ljava/lang/String; a \ No newline at end of file diff --git a/1.14.4/build.properties b/Vanilla/1.8.9/build.properties similarity index 58% rename from 1.14.4/build.properties rename to Vanilla/1.8.9/build.properties index 14ebfb2..8ac6b31 100644 --- a/1.14.4/build.properties +++ b/Vanilla/1.8.9/build.properties @@ -1,7 +1,7 @@ -minecraft_version=1.14.4 -minecraft_full_versions=1.14.4 +minecraft_version=1.8.9 +minecraft_full_versions=1.8.9 #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.14.4.srg \ No newline at end of file +srg_notch_map=1.8.9.tsrg \ No newline at end of file diff --git a/Vanilla/1.8.9/mixin.srg b/Vanilla/1.8.9/mixin.srg new file mode 100644 index 0000000..c47e75b --- /dev/null +++ b/Vanilla/1.8.9/mixin.srg @@ -0,0 +1,24 @@ +CL: net/minecraft/client/entity/AbstractClientPlayer bet +CL: net/minecraft/client/gui/GuiPlayerTabOverlay awh +CL: net/minecraft/client/gui/spectator/PlayerMenuObject bad +CL: net/minecraft/client/Minecraft ave +CL: net/minecraft/client/renderer/ThreadDownloadImageData bma +CL: net/minecraft/client/renderer/texture/TextureManager bmj +CL: net/minecraft/client/resources/SkinManager bnp +CL: net/minecraft/client/resources/SkinManager$SkinAvailableCallback bnp$a +CL: net/minecraft/scoreboard/ScoreObjective auk +CL: net/minecraft/scoreboard/Scoreboard auo +CL: net/minecraft/tileentity/TileEntitySkull alo +CL: net/minecraft/util/ResourceLocation jy +FD: net/minecraft/client/renderer/ThreadDownloadImageData/processTask bma/field_229155_i_ +MD: net/minecraft/client/entity/AbstractClientPlayer/getDownloadImageSkin (Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData; bet/a (Ljy;Ljava/lang/String;)Lbma; +MD: net/minecraft/client/entity/AbstractClientPlayer/getLocationSkin (Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation; bet/c (Ljava/lang/String;)Ljy; +MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V awh/a (ILauo;Lauk;)V +MD: net/minecraft/client/gui/GuiPlayerTabOverlay/renderPlayerlist (Lcom/mojang/blaze3d/matrix/MatrixStack;ILnet/minecraft/scoreboard/Scoreboard;Lnet/minecraft/scoreboard/ScoreObjective;)V awh/func_238523_a_ (Lcom/mojang/blaze3d/matrix/MatrixStack;ILbhk;Lbhg;)V +MD: net/minecraft/client/Minecraft/isIntegratedServerRunning ()Z ave/E ()Z +MD: net/minecraft/client/renderer/ThreadDownloadImageData/loadTexture (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; bma/func_229159_a_ (Ljava/io/InputStream;)Lnet/minecraft/client/renderer/texture/NativeImage; +MD: net/minecraft/client/renderer/ThreadDownloadImageData/processLegacySkin (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; bma/func_229163_c_ (Lnet/minecraft/client/renderer/texture/NativeImage;)Lnet/minecraft/client/renderer/texture/NativeImage; +MD: net/minecraft/client/resources/SkinManager/loadProfileTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;Z)V bnp/a (Lcom/mojang/authlib/GameProfile;Lbnp$a;Z)V +MD: net/minecraft/client/resources/SkinManager/loadSkin (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lnet/minecraft/client/resources/SkinManager$SkinAvailableCallback;)Lnet/minecraft/util/ResourceLocation; bnp/a (Lcom/mojang/authlib/minecraft/MinecraftProfileTexture;Lcom/mojang/authlib/minecraft/MinecraftProfileTexture$Type;Lbnp$a;)Ljy; +MD: net/minecraft/client/resources/SkinManager/loadSkinFromCache (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; bnp/a (Lcom/mojang/authlib/GameProfile;)Ljava/util/Map; +MD: net/minecraft/tileentity/TileEntitySkull/updateGameProfile (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; alo/b (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/GameProfile; \ No newline at end of file diff --git a/Vanilla/1.8.9/resource/Profile.json b/Vanilla/1.8.9/resource/Profile.json new file mode 100644 index 0000000..3af325f --- /dev/null +++ b/Vanilla/1.8.9/resource/Profile.json @@ -0,0 +1,38 @@ +{ + "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": "org/spongepowered/mixin/0.7.11-SNAPSHOT/mixin-0.7.11-20180703.121122-1.jar", + "sha1": "7a670207bdb97db418118ad1e9bb42424ff3776d", + "size": 1017668, + "url": "https://repo.spongepowered.org/maven/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" +} \ No newline at end of file diff --git a/Vanilla/1.8.9/resource/mixins.customskinloader.json b/Vanilla/1.8.9/resource/mixins.customskinloader.json new file mode 100644 index 0000000..c48be13 --- /dev/null +++ b/Vanilla/1.8.9/resource/mixins.customskinloader.json @@ -0,0 +1,16 @@ +{ + "compatibilityLevel": "JAVA_8", + "package": "customskinloader.mixin", + "client": [ + "MixinGuiPlayerTabOverlay", + "MixinMinecraft", + "MixinPlayerMenuObject", + "MixinSkinManager", + "MixinTextureManager", + "MixinTileEntitySkull" + ], + "refmap": "mixins.customskinloader.refmap.json", + "injectors": { + "defaultRequire": 1 + } +} diff --git a/Vanilla/libs/launchwrapper-of-2.1.jar b/Vanilla/libs/launchwrapper-of-2.1.jar new file mode 100644 index 0000000..b2ac8fc Binary files /dev/null and b/Vanilla/libs/launchwrapper-of-2.1.jar differ diff --git a/Vanilla/net/minecraft/client/resources/SkinManager.java b/Vanilla/net/minecraft/client/resources/SkinManager.java deleted file mode 100644 index c06aedb..0000000 --- a/Vanilla/net/minecraft/client/resources/SkinManager.java +++ /dev/null @@ -1,91 +0,0 @@ -package net.minecraft.client.resources; - -import com.google.common.cache.CacheBuilder; -import com.google.common.cache.CacheLoader; -import com.google.common.cache.LoadingCache; -import com.google.common.collect.Maps; -import com.mojang.authlib.GameProfile; -import com.mojang.authlib.minecraft.InsecureTextureException; -import com.mojang.authlib.minecraft.MinecraftProfileTexture; -import com.mojang.authlib.minecraft.MinecraftSessionService; -import com.mojang.authlib.minecraft.MinecraftProfileTexture.Type; -import java.awt.image.BufferedImage; -import java.io.File; -import java.util.Map; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; -import javax.annotation.Nullable; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.IImageBuffer; -import net.minecraft.client.renderer.ImageBufferDownload; -import net.minecraft.client.renderer.ThreadDownloadImageData; -import net.minecraft.client.renderer.texture.ITextureObject; -import net.minecraft.client.renderer.texture.TextureManager; -import net.minecraft.util.ResourceLocation; - -//From 1.12-mcp940 -public class SkinManager -{ - private static final ExecutorService THREAD_POOL = new ThreadPoolExecutor(0, 2, 1L, TimeUnit.MINUTES, new LinkedBlockingQueue()); - private final TextureManager textureManager; - private final File skinCacheDir; - private final MinecraftSessionService sessionService; - private final LoadingCache> skinCacheLoader; - - private customskinloader.fake.FakeSkinManager fakeManager;//Fake Skin Manager - - public SkinManager(TextureManager textureManagerInstance, File skinCacheDirectory, MinecraftSessionService sessionService) - { - this.textureManager = textureManagerInstance; - this.skinCacheDir = skinCacheDirectory; - this.sessionService = sessionService; - this.skinCacheLoader = CacheBuilder.newBuilder().expireAfterAccess(15L, TimeUnit.SECONDS).>build(new CacheLoader>() - { - public Map load(GameProfile p_load_1_) throws Exception - { - try - { - return Minecraft.getMinecraft().getSessionService().getTextures(p_load_1_, false); - } - catch (Throwable var3) - { - return Maps.newHashMap(); - } - } - }); - this.fakeManager=new customskinloader.fake.FakeSkinManager(textureManagerInstance,skinCacheDirectory,sessionService); - } - - /** - * Used in the Skull renderer to fetch a skin. May download the skin if it's not in the cache - */ - public ResourceLocation loadSkin(MinecraftProfileTexture profileTexture, Type textureType) - { - return this.loadSkin(profileTexture, textureType, (SkinManager.SkinAvailableCallback)null); - } - - /** - * May download the skin if its not in the cache, can be passed a SkinManager#SkinAvailableCallback for handling - */ - public ResourceLocation loadSkin(final MinecraftProfileTexture profileTexture, final Type textureType, @Nullable final SkinManager.SkinAvailableCallback skinAvailableCallback) - { - return this.fakeManager.loadSkin(profileTexture, textureType, skinAvailableCallback); - } - - public void loadProfileTextures(final GameProfile profile, final SkinManager.SkinAvailableCallback skinAvailableCallback, final boolean requireSecure) - { - this.fakeManager.loadProfileTextures(profile, skinAvailableCallback, requireSecure); - } - - public Map loadSkinFromCache(GameProfile profile) - { - return this.fakeManager.loadSkinFromCache(profile); - } - - public interface SkinAvailableCallback - { - void skinAvailable(Type typeIn, ResourceLocation location, MinecraftProfileTexture profileTexture); - } -} diff --git a/Fabric/source/customskinloader/fabric/mixin/MixinGuiPlayerTabOverlay.java b/Vanilla/source/customskinloader/mixin/MixinGuiPlayerTabOverlay.java similarity index 94% rename from Fabric/source/customskinloader/fabric/mixin/MixinGuiPlayerTabOverlay.java rename to Vanilla/source/customskinloader/mixin/MixinGuiPlayerTabOverlay.java index 65e16b3..ec75bff 100644 --- a/Fabric/source/customskinloader/fabric/mixin/MixinGuiPlayerTabOverlay.java +++ b/Vanilla/source/customskinloader/mixin/MixinGuiPlayerTabOverlay.java @@ -1,4 +1,4 @@ -package customskinloader.fabric.mixin; +package customskinloader.mixin; import net.minecraft.client.Minecraft; import net.minecraft.client.gui.GuiPlayerTabOverlay; @@ -7,6 +7,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(GuiPlayerTabOverlay.class) +@SuppressWarnings("target") public abstract class MixinGuiPlayerTabOverlay { @Redirect( method = { diff --git a/Fabric/source/customskinloader/fabric/mixin/MixinMinecraft.java b/Vanilla/source/customskinloader/mixin/MixinMinecraft.java similarity index 85% rename from Fabric/source/customskinloader/fabric/mixin/MixinMinecraft.java rename to Vanilla/source/customskinloader/mixin/MixinMinecraft.java index e5dac4b..a44a7a2 100644 --- a/Fabric/source/customskinloader/fabric/mixin/MixinMinecraft.java +++ b/Vanilla/source/customskinloader/mixin/MixinMinecraft.java @@ -1,4 +1,4 @@ -package customskinloader.fabric.mixin; +package customskinloader.mixin; import customskinloader.fake.itf.IFakeMinecraft; import net.minecraft.client.Minecraft; diff --git a/Vanilla/source/customskinloader/mixin/MixinPlayerMenuObject.java b/Vanilla/source/customskinloader/mixin/MixinPlayerMenuObject.java new file mode 100644 index 0000000..5ff1040 --- /dev/null +++ b/Vanilla/source/customskinloader/mixin/MixinPlayerMenuObject.java @@ -0,0 +1,34 @@ +package customskinloader.mixin; + +import customskinloader.fake.FakeClientPlayer; +import net.minecraft.client.gui.spectator.PlayerMenuObject; +import net.minecraft.client.renderer.ThreadDownloadImageData; +import net.minecraft.util.ResourceLocation; +import org.spongepowered.asm.mixin.Mixin; +import org.spongepowered.asm.mixin.injection.At; +import org.spongepowered.asm.mixin.injection.Redirect; + +@Mixin(PlayerMenuObject.class) +public abstract class MixinPlayerMenuObject { + @Redirect( + method = "Lnet/minecraft/client/gui/spectator/PlayerMenuObject;(Lcom/mojang/authlib/GameProfile;)V", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/entity/AbstractClientPlayer;getLocationSkin(Ljava/lang/String;)Lnet/minecraft/util/ResourceLocation;" + ) + ) + private ResourceLocation redirect_init(String username) { + return FakeClientPlayer.getLocationSkin(username); + } + + @Redirect( + method = "Lnet/minecraft/client/gui/spectator/PlayerMenuObject;(Lcom/mojang/authlib/GameProfile;)V", + at = @At( + value = "INVOKE", + target = "Lnet/minecraft/client/entity/AbstractClientPlayer;getDownloadImageSkin(Lnet/minecraft/util/ResourceLocation;Ljava/lang/String;)Lnet/minecraft/client/renderer/ThreadDownloadImageData;" + ) + ) + private ThreadDownloadImageData redirect_init(ResourceLocation resourceLocationIn, String username) { + return FakeClientPlayer.getDownloadImageSkin(resourceLocationIn, username); + } +} diff --git a/Fabric/source/customskinloader/fabric/mixin/MixinSkinManager.java b/Vanilla/source/customskinloader/mixin/MixinSkinManager.java similarity index 98% rename from Fabric/source/customskinloader/fabric/mixin/MixinSkinManager.java rename to Vanilla/source/customskinloader/mixin/MixinSkinManager.java index 13f1793..e63629a 100644 --- a/Fabric/source/customskinloader/fabric/mixin/MixinSkinManager.java +++ b/Vanilla/source/customskinloader/mixin/MixinSkinManager.java @@ -1,4 +1,4 @@ -package customskinloader.fabric.mixin; +package customskinloader.mixin; import java.io.File; import java.util.Map; diff --git a/Fabric/source/customskinloader/fabric/mixin/MixinTextureManager.java b/Vanilla/source/customskinloader/mixin/MixinTextureManager.java similarity index 93% rename from Fabric/source/customskinloader/fabric/mixin/MixinTextureManager.java rename to Vanilla/source/customskinloader/mixin/MixinTextureManager.java index de95454..f4671a4 100644 --- a/Fabric/source/customskinloader/fabric/mixin/MixinTextureManager.java +++ b/Vanilla/source/customskinloader/mixin/MixinTextureManager.java @@ -1,4 +1,4 @@ -package customskinloader.fabric.mixin; +package customskinloader.mixin; import customskinloader.fake.itf.IFakeTextureManager_1; import customskinloader.fake.itf.IFakeTextureManager_2; diff --git a/Fabric/source/customskinloader/fabric/mixin/MixinThreadDownloadImageData.java b/Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageData.java similarity index 94% rename from Fabric/source/customskinloader/fabric/mixin/MixinThreadDownloadImageData.java rename to Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageData.java index 8086acb..e5975a6 100644 --- a/Fabric/source/customskinloader/fabric/mixin/MixinThreadDownloadImageData.java +++ b/Vanilla/source/customskinloader/mixin/MixinThreadDownloadImageData.java @@ -1,4 +1,4 @@ -package customskinloader.fabric.mixin; +package customskinloader.mixin; import customskinloader.fake.FakeSkinBuffer; import net.minecraft.client.renderer.ThreadDownloadImageData; @@ -10,6 +10,7 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; @Mixin(ThreadDownloadImageData.class) +@SuppressWarnings("target") public abstract class MixinThreadDownloadImageData { @Final @Shadow diff --git a/Fabric/source/customskinloader/fabric/mixin/MixinTileEntitySkull.java b/Vanilla/source/customskinloader/mixin/MixinTileEntitySkull.java similarity index 95% rename from Fabric/source/customskinloader/fabric/mixin/MixinTileEntitySkull.java rename to Vanilla/source/customskinloader/mixin/MixinTileEntitySkull.java index acf7b22..c5add08 100644 --- a/Fabric/source/customskinloader/fabric/mixin/MixinTileEntitySkull.java +++ b/Vanilla/source/customskinloader/mixin/MixinTileEntitySkull.java @@ -1,4 +1,4 @@ -package customskinloader.fabric.mixin; +package customskinloader.mixin; import com.mojang.authlib.GameProfile; import net.minecraft.tileentity.TileEntitySkull; diff --git a/Vanilla/customskinloader/tweaker/ClassTransformer.java b/Vanilla/source/customskinloader/tweaker/ClassTransformer.java similarity index 98% rename from Vanilla/customskinloader/tweaker/ClassTransformer.java rename to Vanilla/source/customskinloader/tweaker/ClassTransformer.java index 8c7baf3..e30bde7 100644 --- a/Vanilla/customskinloader/tweaker/ClassTransformer.java +++ b/Vanilla/source/customskinloader/tweaker/ClassTransformer.java @@ -49,7 +49,7 @@ public class ClassTransformer implements IClassTransformer { continue; } zipFile = tempZipFile; - Enumeration entries=(Enumeration) zipFile.entries(); + Enumeration entries=zipFile.entries(); StringBuilder sb=new StringBuilder(); while(entries.hasMoreElements()){ ZipEntry entry=entries.nextElement(); diff --git a/Vanilla/customskinloader/tweaker/ModSystemTweaker.java b/Vanilla/source/customskinloader/tweaker/ModSystemTweaker.java similarity index 100% rename from Vanilla/customskinloader/tweaker/ModSystemTweaker.java rename to Vanilla/source/customskinloader/tweaker/ModSystemTweaker.java diff --git a/Vanilla/customskinloader/tweaker/Tweaker.java b/Vanilla/source/customskinloader/tweaker/Tweaker.java similarity index 75% rename from Vanilla/customskinloader/tweaker/Tweaker.java rename to Vanilla/source/customskinloader/tweaker/Tweaker.java index cb6bc03..e7ddc04 100644 --- a/Vanilla/customskinloader/tweaker/Tweaker.java +++ b/Vanilla/source/customskinloader/tweaker/Tweaker.java @@ -9,27 +9,33 @@ import org.apache.commons.lang3.ArrayUtils; import net.minecraft.launchwrapper.ITweaker; import net.minecraft.launchwrapper.LaunchClassLoader; +import org.spongepowered.asm.launch.MixinBootstrap; +import org.spongepowered.asm.mixin.MixinEnvironment; +import org.spongepowered.asm.mixin.Mixins; public class Tweaker implements ITweaker { private String[] args; - + public static Logger logger = new Logger(); public void acceptOptions(List args, File gameDir, File assetsDir, String profile) { File tweakerLogFile = new File(gameDir,"./CustomSkinLoader/Tweaker.log"); logger = new Logger(tweakerLogFile); - + logger.info("Using Tweaker"); logger.info("Tweaker: acceptOptions"); - + String[] temp={"--gameDir",gameDir.getAbsolutePath(),"--assetsDir",assetsDir.getAbsolutePath(),"--version",profile}; - this.args=ArrayUtils.addAll(args.toArray(new String[args.size()]), temp); + this.args=ArrayUtils.addAll(args.toArray(new String[0]), temp); } public void injectIntoClassLoader(LaunchClassLoader classLoader) { logger.info("Tweaker: injectIntoClassLoader"); logger.info("Loaded as a library."); + MixinBootstrap.init(); + Mixins.addConfiguration("mixins.customskinloader.json"); + MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT); } public String getLaunchTarget() { diff --git a/common.gradle b/common.gradle index 70251bd..cee29b6 100644 --- a/common.gradle +++ b/common.gradle @@ -1,17 +1,5 @@ -buildscript { - repositories { - mavenCentral() - jcenter() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - } -} apply plugin: 'net.minecraftforge.gradle.forge' +apply plugin: 'org.spongepowered.mixin' ext.configFile = file "build.properties" configFile.withReader { @@ -49,23 +37,48 @@ jar { attributes 'TweakVersion': version attributes 'TweakOrder' : '-10' } - exclude 'net/minecraft/client/renderer/texture/NativeImage.class' - exclude 'net/minecraft/client/Minecraft.class' + from { + configurations.provided.collect { + it.isDirectory() ? it : zipTree(it) + } + } + exclude 'net/minecraft/client/renderer/texture/**' + exclude 'Profile.json' +} + +repositories { + maven { + name = "sponge" + url = "https://repo.spongepowered.org/maven" + } +} + +dependencies { + implementation 'org.spongepowered:mixin:0.8' + provided fileTree(dir: "${rootDir}/Vanilla/libs", include: "*.jar") +} + +mixin { + add sourceSets.main, "mixins.customskinloader.refmap.json" + reobfSrgFile = "mixin.srg" + reobfNotchSrgFile = "mixin.srg" } sourceSets { main { java { //Common - srcDir '../Common/source' + srcDir "${rootDir}/Common/source" //Vanilla - srcDir '../Vanilla' + srcDir "${rootDir}/Vanilla/source" //Special - srcDir 'source' + srcDir "source" } resources { //Common - srcDir '../Common/resource' + srcDir "${rootDir}/Common/resource" + //Special + srcDir "resource" } } } @@ -79,10 +92,13 @@ processResources { mcFullVersions : config.minecraft_full_versions, forgeVersion : config.forge_version, gitVersion : System.getenv("CIRCLE_SHA1"), - buildUrl : System.getenv("CIRCLE_BUILD_URL") + buildUrl : System.getenv("CIRCLE_BUILD_URL"), + releaseTime : new Date().format("yyyy-MM-dd'T'HH:mm:ssZ") ]) } +import java.security.MessageDigest + apply from: rootProject.file("BuildScripts/remap.gradle") task afterBuild { doLast { @@ -96,12 +112,12 @@ task afterBuild { //copyBuildFile copy { - from 'build/libs' - into '../build/libs' - include '**/*.jar' - exclude '**/*-srg.jar' - exclude '**/*-dev.jar' - exclude '**/*-sources.jar' + from "build/libs" + into "${rootDir}/build/libs" + include "**/*.jar" + exclude "**/*-srg.jar" + exclude "**/*-dev.jar" + exclude "**/*-sources.jar" } //copyProfileJson @@ -109,7 +125,15 @@ task afterBuild { String of = String.format("build/libs/%s-CSL-%s.json", config.minecraft_version, shortVersion) File off = rootProject.file(of) off.parentFile.mkdirs() - f.renameTo(off) + + 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" + } + } } } build.finalizedBy afterBuild diff --git a/settings.gradle b/settings.gradle index 571d003..f7affa5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,5 +1,8 @@ //Special Vanilla Edition -include "1.14.4" +include "Vanilla/1.8.9" +include "Vanilla/1.12.2" +include "Vanilla/1.15.2" +include "Vanilla/1.16.1" //Universal Forge Edition for [1.8,) include "Forge"