mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remap resource pack profile stuff as I revisit it during api writing (#879) 

* Remap resource pack profile stuff as I revisit it during api writing

Signed-off-by: liach <liach@users.noreply.github.com>

* ResourcePackCreator -> ResourcePackProvider
ResourcePackProfileManager -> ResourcePackManager

Signed-off-by: liach <liach@users.noreply.github.com>

* Minor

Signed-off-by: liach <liach@users.noreply.github.com>
This commit is contained in:
liach 2019-10-09 11:44:35 -05:00 committed by Modmuss50
parent e68c809d40
commit 8de7fde3c9
18 changed files with 78 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mappings/net/minecraft/client/MinecraftClient.mapping
View File

@ -27,13 +27,13 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_1712 nextDebugInfoUpdateTime J
FIELD field_1713 particleManager Lnet/minecraft/class_702;
FIELD field_1714 musicTracker Lnet/minecraft/class_1142;
FIELD field_1715 resourcePackContainerManager Lnet/minecraft/class_3283;
FIELD field_1715 resourcePackManager Lnet/minecraft/class_3283;
FIELD field_1717 languageManager Lnet/minecraft/class_1076;
FIELD field_1718 memoryReservedForCrash [B
FIELD field_1719 cameraEntity Lnet/minecraft/class_1297;
FIELD field_1720 versionType Ljava/lang/String;
FIELD field_1721 isDemo Z
FIELD field_1722 resourcePackCreator Lnet/minecraft/class_1066;
FIELD field_1722 builtinPackProvider Lnet/minecraft/class_1066;
FIELD field_1723 sessionService Lcom/mojang/authlib/minecraft/MinecraftSessionService;
FIELD field_1724 player Lnet/minecraft/class_746;
FIELD field_1726 session Lnet/minecraft/class_320;
@ -128,7 +128,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
METHOD method_1516 getResourcePackDownloader ()Lnet/minecraft/class_1066;
METHOD method_1517 isFancyGraphicsEnabled ()Z
METHOD method_1519 cleanUpAfterCrash ()V
METHOD method_1520 getResourcePackContainerManager ()Lnet/minecraft/class_3283;
METHOD method_1520 getResourcePackManager ()Lnet/minecraft/class_3283;
METHOD method_1521 reloadResources ()Ljava/util/concurrent/CompletableFuture;
METHOD method_1522 getFramebuffer ()Lnet/minecraft/class_276;
METHOD method_1523 render (Z)V

19
mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackListWidget.mapping
View File

@ -3,22 +3,23 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/resourcepack/Resou
FIELD field_19128 client Lnet/minecraft/class_310;
FIELD field_19129 screen Lnet/minecraft/class_519;
FIELD field_19130 resourcePackList Lnet/minecraft/class_521;
FIELD field_19131 packContainer Lnet/minecraft/class_1075;
FIELD field_19131 pack Lnet/minecraft/class_1075;
METHOD <init> (Lnet/minecraft/class_521;Lnet/minecraft/class_519;Lnet/minecraft/class_1075;)V
ARG 1 listWidget
ARG 2 screen
ARG 3 packContainer
ARG 3 pack
METHOD method_20144 drawIcon ()V
METHOD method_20145 setList (Lnet/minecraft/class_523;)V
METHOD method_20145 enable (Lnet/minecraft/class_523;)V
ARG 1 list
METHOD method_20147 getCompatibility ()Lnet/minecraft/class_3281;
METHOD method_20148 getDescription ()Ljava/lang/String;
METHOD method_20149 getDisplayName ()Ljava/lang/String;
METHOD method_20150 getPackContainer ()Lnet/minecraft/class_1075;
METHOD method_20152 canSelect ()Z
METHOD method_20153 canRemove ()Z
METHOD method_20154 canSortUp ()Z
METHOD method_20155 canSortDown ()Z
METHOD method_20150 getPack ()Lnet/minecraft/class_1075;
METHOD method_20151 isMoveable ()Z
METHOD method_20152 isSelectable ()Z
METHOD method_20153 isRemovable ()Z
METHOD method_20154 canMoveUp ()Z
METHOD method_20155 canMoveDown ()Z
METHOD method_20156 getScreen ()Lnet/minecraft/class_519;
METHOD mouseClicked (DDI)Z
ARG 1 mouseX
@ -34,5 +35,5 @@ CLASS net/minecraft/class_521 net/minecraft/client/gui/screen/resourcepack/Resou
ARG 2 width
ARG 3 height
ARG 4 title
METHOD method_2690 addEntry (Lnet/minecraft/class_521$class_4271;)V
METHOD method_2690 add (Lnet/minecraft/class_521$class_4271;)V
ARG 1 entry

12
mappings/net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen.mapping
View File

@ -1,16 +1,16 @@
CLASS net/minecraft/class_519 net/minecraft/client/gui/screen/resourcepack/ResourcePackOptionsScreen
FIELD field_3154 selectedPacks Lnet/minecraft/class_523;
FIELD field_3155 edited Z
FIELD field_3154 enabledPacks Lnet/minecraft/class_523;
FIELD field_3155 dirty Z
FIELD field_3156 parent Lnet/minecraft/class_437;
FIELD field_3157 availablePacks Lnet/minecraft/class_522;
METHOD <init> (Lnet/minecraft/class_437;)V
ARG 1 parent
METHOD method_2660 setEdited ()V
METHOD method_2663 remove (Lnet/minecraft/class_521$class_4271;)V
METHOD method_2660 markDirty ()V
METHOD method_2663 disable (Lnet/minecraft/class_521$class_4271;)V
ARG 1 resourcePack
METHOD method_2669 isSelected (Lnet/minecraft/class_521$class_4271;)Z
METHOD method_2669 isEnabled (Lnet/minecraft/class_521$class_4271;)Z
ARG 1 resourcePack
METHOD method_2674 select (Lnet/minecraft/class_521$class_4271;)V
METHOD method_2674 enable (Lnet/minecraft/class_521$class_4271;)V
ARG 1 resourcePack
METHOD render (IIF)V
ARG 1 mouseX

2
mappings/net/minecraft/client/resource/ClientResourcePackCreator.mapping → mappings/net/minecraft/client/resource/ClientBuiltinResourcePackProvider.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientResourcePackCreator
CLASS net/minecraft/class_1066 net/minecraft/client/resource/ClientBuiltinResourcePackProvider
FIELD field_16263 index Lnet/minecraft/class_1064;
FIELD field_5292 serverPacksRoot Ljava/io/File;
FIELD field_5293 pack Lnet/minecraft/class_3268;

10
mappings/net/minecraft/client/resource/ClientResourcePackContainer.mapping → mappings/net/minecraft/client/resource/ClientResourcePackProfile.mapping
View File

@ -1,8 +1,15 @@
CLASS net/minecraft/class_1075 net/minecraft/client/resource/ClientResourcePackContainer
CLASS net/minecraft/class_1075 net/minecraft/client/resource/ClientResourcePackProfile
FIELD field_5320 iconId Lnet/minecraft/class_2960;
FIELD field_5321 icon Lnet/minecraft/class_1011;
METHOD <init> (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_3281;Lnet/minecraft/class_3288$class_3289;ZLnet/minecraft/class_1011;)V
ARG 1 name
ARG 2 alwaysEnabled
ARG 3 packFactory
ARG 4 displayName
ARG 5 description
ARG 6 compatibility
ARG 8 pinned
ARG 9 icon
METHOD <init> (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_3262;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;)V
ARG 1 name
ARG 2 notSorting
@ -11,3 +18,4 @@ CLASS net/minecraft/class_1075 net/minecraft/client/resource/ClientResourcePackC
ARG 5 metadata
ARG 6 direction
METHOD method_4664 drawIcon (Lnet/minecraft/class_1060;)V
ARG 1 manager

4
mappings/net/minecraft/resource/DefaultResourcePack.mapping
View File

@ -1,8 +1,8 @@
CLASS net/minecraft/class_3268 net/minecraft/resource/DefaultResourcePack
FIELD field_14193 namespaces Ljava/util/Set;
FIELD field_14194 RESOURCE_CLASS Ljava/lang/Class;
FIELD field_14194 resourceClass Ljava/lang/Class;
FIELD field_14195 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_14196 RESOURCE_PATH Ljava/nio/file/Path;
FIELD field_14196 resourcePath Ljava/nio/file/Path;
FIELD field_17917 typeToFileSystem Ljava/util/Map;
METHOD <init> ([Ljava/lang/String;)V
ARG 1 namespaces

2
mappings/net/minecraft/resource/DefaultResourcePackCreator.mapping
View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_3286 net/minecraft/resource/DefaultResourcePackCreator
FIELD field_14269 pack Lnet/minecraft/class_3268;

2
mappings/net/minecraft/resource/FileResourcePackCreator.mapping → mappings/net/minecraft/resource/FileResourcePackProvider.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackCreator
CLASS net/minecraft/class_3279 net/minecraft/resource/FileResourcePackProvider
FIELD field_14217 POSSIBLE_PACK Ljava/io/FileFilter;
FIELD field_14218 packsFolder Ljava/io/File;
METHOD <init> (Ljava/io/File;)V

2
mappings/net/minecraft/resource/ResourcePackCompatibility.mapping
View File

@ -1,8 +1,6 @@
CLASS net/minecraft/class_3281 net/minecraft/resource/ResourcePackCompatibility
FIELD field_14219 notification Lnet/minecraft/class_2561;
FIELD field_14220 TOO_NEW Lnet/minecraft/class_3281;
FIELD field_14222 confirmMessage Lnet/minecraft/class_2561;
FIELD field_14223 TOO_OLD Lnet/minecraft/class_3281;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 translationSuffix
METHOD method_14436 from (I)Lnet/minecraft/class_3281;

18
mappings/net/minecraft/resource/ResourcePackContainerManager.mapping
View File

@ -1,18 +0,0 @@
CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackContainerManager
FIELD field_14225 enabledContainers Ljava/util/List;
FIELD field_14226 nameToContainer Ljava/util/Map;
FIELD field_14227 creators Ljava/util/Set;
FIELD field_14228 factory Lnet/minecraft/class_3288$class_3290;
METHOD <init> (Lnet/minecraft/class_3288$class_3290;)V
ARG 1 factory
METHOD method_14441 getAlphabeticallyOrderedContainers ()Ljava/util/Collection;
METHOD method_14442 getDisabledContainers ()Ljava/util/Collection;
METHOD method_14443 addCreator (Lnet/minecraft/class_3285;)V
ARG 1 creator
METHOD method_14444 getEnabledContainers ()Ljava/util/Collection;
METHOD method_14445 callCreators ()V
METHOD method_14447 setEnabled (Ljava/util/Collection;)V
ARG 1 enabled
METHOD method_14448 sortMapByName ()V
METHOD method_14449 getContainer (Ljava/lang/String;)Lnet/minecraft/class_3288;
ARG 1 name

4
mappings/net/minecraft/resource/ResourcePackCreator.mapping
View File

@ -1,4 +0,0 @@
CLASS net/minecraft/class_3285 net/minecraft/resource/ResourcePackCreator
METHOD method_14453 registerContainer (Ljava/util/Map;Lnet/minecraft/class_3288$class_3290;)V
ARG 1 registry
ARG 2 factory

18
mappings/net/minecraft/resource/ResourcePackManager.mapping Normal file
View File

@ -0,0 +1,18 @@
CLASS net/minecraft/class_3283 net/minecraft/resource/ResourcePackManager
FIELD field_14225 enabled Ljava/util/List;
FIELD field_14226 profiles Ljava/util/Map;
FIELD field_14227 providers Ljava/util/Set;
FIELD field_14228 profileFactory Lnet/minecraft/class_3288$class_3290;
METHOD <init> (Lnet/minecraft/class_3288$class_3290;)V
ARG 1 factory
METHOD method_14441 getProfiles ()Ljava/util/Collection;
METHOD method_14442 getDisabledProfiles ()Ljava/util/Collection;
METHOD method_14443 registerProvider (Lnet/minecraft/class_3285;)V
ARG 1 provider
METHOD method_14444 getEnabledProfiles ()Ljava/util/Collection;
METHOD method_14445 scanPacks ()V
METHOD method_14447 setEnabledProfiles (Ljava/util/Collection;)V
ARG 1 enabled
METHOD method_14448 sort ()V
METHOD method_14449 getProfile (Ljava/lang/String;)Lnet/minecraft/class_3288;
ARG 1 name

31
mappings/net/minecraft/resource/ResourcePackContainer.mapping → mappings/net/minecraft/resource/ResourcePackProfile.mapping
View File

@ -1,23 +1,23 @@
CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackContainer
CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackProfile
CLASS class_3289 InsertionPosition
METHOD method_14467 inverse ()Lnet/minecraft/class_3288$class_3289;
METHOD method_14468 insert (Ljava/util/List;Ljava/lang/Object;Ljava/util/function/Function;Z)I
ARG 1 items
ARG 2 item
ARG 3 converter
ARG 4 inverse
ARG 3 profileGetter
ARG 4 listInversed
CLASS class_3290 Factory
METHOD create (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_3262;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;)Lnet/minecraft/class_3288;
ARG 1 name
ARG 2 alwaysCreatePack
ARG 2 alwaysEnabled
ARG 3 packFactory
ARG 4 pack
ARG 5 meta
ARG 6 insertionPosition
FIELD field_14270 positionFixed Z
FIELD field_14271 notSorting Z
FIELD field_14270 pinned Z
FIELD field_14271 alwaysEnabled Z
FIELD field_14272 name Ljava/lang/String;
FIELD field_14273 packCreator Ljava/util/function/Supplier;
FIELD field_14273 packGetter Ljava/util/function/Supplier;
FIELD field_14274 displayName Lnet/minecraft/class_2561;
FIELD field_14275 description Lnet/minecraft/class_2561;
FIELD field_14276 BROKEN_PACK_META Lnet/minecraft/class_3272;
@ -26,17 +26,17 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackContainer
FIELD field_14279 LOGGER Lorg/apache/logging/log4j/Logger;
METHOD <init> (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;Lnet/minecraft/class_3281;Lnet/minecraft/class_3288$class_3289;Z)V
ARG 1 name
ARG 2 notSorting
ARG 3 packCreator
ARG 2 alwaysEnabled
ARG 3 packFactory
ARG 4 displayName
ARG 5 description
ARG 6 compatibility
ARG 7 direction
ARG 8 tillEnd
ARG 8 pinned
METHOD <init> (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_3262;Lnet/minecraft/class_3272;Lnet/minecraft/class_3288$class_3289;)V
ARG 1 name
ARG 2 notSorting
ARG 3 packCreator
ARG 2 alwaysEnabled
ARG 3 packFactory
ARG 4 pack
ARG 5 metadata
ARG 6 direction
@ -44,7 +44,7 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackContainer
ARG 1 o
METHOD method_14456 of (Ljava/lang/String;ZLjava/util/function/Supplier;Lnet/minecraft/class_3288$class_3290;Lnet/minecraft/class_3288$class_3289;)Lnet/minecraft/class_3288;
ARG 0 name
ARG 1 alwaysCreatePack
ARG 1 alwaysEnabled
ARG 2 packFactory
ARG 3 containerFactory
ARG 4 insertionPosition
@ -53,7 +53,8 @@ CLASS net/minecraft/class_3288 net/minecraft/resource/ResourcePackContainer
METHOD method_14459 getDescription ()Lnet/minecraft/class_2561;
METHOD method_14460 getCompatibility ()Lnet/minecraft/class_3281;
METHOD method_14461 getInformationText (Z)Lnet/minecraft/class_2561;
ARG 1 enabled
METHOD method_14463 getName ()Ljava/lang/String;
METHOD method_14464 canBeSorted ()Z
METHOD method_14465 isPositionFixed ()Z
METHOD method_14464 isAlwaysEnabled ()Z
METHOD method_14465 isPinned ()Z
METHOD method_14466 getInitialPosition ()Lnet/minecraft/class_3288$class_3289;

4
mappings/net/minecraft/resource/ResourcePackProvider.mapping Normal file
View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_3285 net/minecraft/resource/ResourcePackProvider
METHOD method_14453 register (Ljava/util/Map;Lnet/minecraft/class_3288$class_3290;)V
ARG 1 registry
ARG 2 factory

1
mappings/net/minecraft/resource/ResourceReloadListener.mapping
View File

@ -2,6 +2,7 @@ CLASS net/minecraft/class_3302 net/minecraft/resource/ResourceReloadListener
CLASS class_4045 Synchronizer
METHOD method_18352 whenPrepared (Ljava/lang/Object;)Ljava/util/concurrent/CompletableFuture;
ARG 1 preparedObject
METHOD method_22322 getName ()Ljava/lang/String;
METHOD reload (Lnet/minecraft/class_3302$class_4045;Lnet/minecraft/class_3300;Lnet/minecraft/class_3695;Lnet/minecraft/class_3695;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture;
ARG 1 synchronizer
ARG 2 manager

4
mappings/net/minecraft/resource/ResourceType.mapping
View File

@ -1,5 +1,5 @@
CLASS net/minecraft/class_3264 net/minecraft/resource/ResourceType
FIELD field_14189 name Ljava/lang/String;
FIELD field_14189 directory Ljava/lang/String;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V
ARG 3 name
METHOD method_14413 getName ()Ljava/lang/String;
METHOD method_14413 getDirectory ()Ljava/lang/String;

2
mappings/net/minecraft/resource/VanillaDataPackProvider.mapping Normal file
View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_3286 net/minecraft/resource/VanillaDataPackProvider
FIELD field_14269 pack Lnet/minecraft/class_3268;

6
mappings/net/minecraft/server/MinecraftServer.mapping
View File

@ -22,7 +22,7 @@ CLASS net/minecraft/server/MinecraftServer
FIELD field_4550 playerManager Lnet/minecraft/class_3324;
FIELD field_4551 lastPlayerSampleUpdate J
FIELD field_4552 keyPair Ljava/security/KeyPair;
FIELD field_4553 dataPackCreator Lnet/minecraft/class_3279;
FIELD field_4553 fileDataPackProvider Lnet/minecraft/class_3279;
FIELD field_4554 flightEnabled Z
FIELD field_4555 serverPort I
FIELD field_4556 userCache Lnet/minecraft/class_3312;
@ -61,7 +61,7 @@ CLASS net/minecraft/server/MinecraftServer
FIELD field_4592 tickTime F
FIELD field_4593 metadata Lnet/minecraft/class_2926;
FIELD field_4594 authService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;
FIELD field_4595 dataPackContainerManager Lnet/minecraft/class_3283;
FIELD field_4595 dataPackManager Lnet/minecraft/class_3283;
FIELD field_4596 playerIdleTimeout I
FIELD field_4597 profilerStartQueued Z
FIELD field_4599 proxy Ljava/net/Proxy;
@ -238,7 +238,7 @@ CLASS net/minecraft/server/MinecraftServer
ARG 1 motd
METHOD method_3835 getPermissionLevel (Lcom/mojang/authlib/GameProfile;)I
ARG 1 profile
METHOD method_3836 getDataPackContainerManager ()Lnet/minecraft/class_3283;
METHOD method_3836 getDataPackManager ()Lnet/minecraft/class_3283;
METHOD method_3837 getBossBarManager ()Lnet/minecraft/class_3004;
METHOD method_3838 setDefaultGameMode (Lnet/minecraft/class_1934;)V
METHOD method_3839 isNetherAllowed ()Z