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

Random fixes (#1265) 

* bug fixes

* Update BlockEntity.mapping

* abcd -> xyzw

* closes #856
This commit is contained in:
Yanis48 2020-04-07 01:29:55 +02:00 committed by GitHub
parent b4efaeadd2
commit 19270ae02a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 46 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/block/Block.mapping
View File

@ -9,7 +9,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
FIELD field_18966 SOLID_MEDIUM_SQUARE_SHAPE Lnet/minecraft/class_265;
FIELD field_19061 SOLID_SMALL_SQUARE_SHAPE Lnet/minecraft/class_265;
FIELD field_19312 FULL_CUBE_SHAPE_CACHE Lcom/google/common/cache/LoadingCache;
METHOD method_16361 topCoversMediumSquare (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
METHOD method_16361 hasTopRim (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;)Z
ARG 0 world
ARG 1 pos
METHOD method_20044 sideCoversSmallSquare (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z

4
mappings/net/minecraft/block/entity/BlockEntity.mapping
View File

@ -16,6 +16,7 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
ARG 1 tag
METHOD method_11000 resetBlock ()V
METHOD method_11001 applyMirror (Lnet/minecraft/class_2415;)V
ARG 1 mirror
METHOD method_11002 hasWorld ()Z
METHOD method_11003 populateCrashReport (Lnet/minecraft/class_129;)V
METHOD method_11004 onBlockAction (II)Z
@ -33,9 +34,10 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity
ARG 1 world
ARG 2 pos
METHOD method_11010 getCachedState ()Lnet/minecraft/class_2680;
METHOD method_11011 shouldNotCopyTagFromItem ()Z
METHOD method_11011 copyItemDataRequiresOperator ()Z
METHOD method_11012 markRemoved ()V
METHOD method_11013 applyRotation (Lnet/minecraft/class_2470;)V
ARG 1 rotation
METHOD method_11014 fromTag (Lnet/minecraft/class_2680;Lnet/minecraft/class_2487;)V
ARG 1 state
ARG 2 tag

2
mappings/net/minecraft/entity/Entity.mapping
View File

@ -340,7 +340,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
METHOD method_5684 setInvulnerable (Z)V
ARG 1 invulnerable
METHOD method_5685 getPassengerList ()Ljava/util/List;
METHOD method_5687 allowsPermissionLevel (I)Z
METHOD method_5687 hasPermissionLevel (I)Z
ARG 1 permissionLevel
METHOD method_5688 interact (Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Z
COMMENT Called when a player interacts with this entity.

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

@ -12,6 +12,7 @@ CLASS net/minecraft/server/MinecraftServer
FIELD field_20850 dataCommandStorage Lnet/minecraft/class_4565;
FIELD field_20851 predicateManager Lnet/minecraft/class_4567;
FIELD field_22250 tickTimeTracker Lnet/minecraft/class_4757;
FIELD field_23784 session Lnet/minecraft/class_32$class_5143;
FIELD field_4543 onlineMode Z
FIELD field_4544 running Z
FIELD field_4545 forceGameMode Z
@ -84,7 +85,7 @@ CLASS net/minecraft/server/MinecraftServer
ARG 1 properties
METHOD method_19465 sendDifficulty (Lnet/minecraft/class_3222;)V
ARG 1 player
METHOD method_19466 isOwner (Lcom/mojang/authlib/GameProfile;)Z
METHOD method_19466 isHost (Lcom/mojang/authlib/GameProfile;)Z
ARG 1 profile
METHOD method_19467 setDifficultyLocked (Z)V
ARG 1 locked
@ -137,6 +138,7 @@ CLASS net/minecraft/server/MinecraftServer
ARG 1 tickable
METHOD method_3743 warn (Ljava/lang/String;)V
METHOD method_3744 setCrashReport (Lnet/minecraft/class_128;)V
ARG 1 report
METHOD method_3745 setFlightEnabled (Z)V
ARG 1 flightEnabled
METHOD method_3747 stop (Z)V
@ -153,6 +155,7 @@ CLASS net/minecraft/server/MinecraftServer
METHOD method_3761 shouldForceGameMode ()Z
METHOD method_3762 logError (Ljava/lang/String;)V
METHOD method_3763 openToLan (Lnet/minecraft/class_1934;ZI)Z
ARG 1 gameMode
ARG 2 cheatsAllowed
ARG 3 port
METHOD method_3764 setPreventProxyConnections (Z)V
@ -180,6 +183,9 @@ CLASS net/minecraft/server/MinecraftServer
METHOD method_3783 isMonsterSpawningEnabled ()Z
METHOD method_3784 getResourcePackUrl ()Ljava/lang/String;
METHOD method_3785 isSpawnProtected (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;)Z
ARG 1 world
ARG 2 pos
ARG 3 player
METHOD method_3786 createWorlds (Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_1940;Lnet/minecraft/class_3949;)V
ARG 2 properties
METHOD method_3787 getNetworkIo ()Lnet/minecraft/class_3242;
@ -194,10 +200,12 @@ CLASS net/minecraft/server/MinecraftServer
METHOD method_3795 getSnooper ()Lnet/minecraft/class_1276;
METHOD method_3796 shouldSpawnAnimals ()Z
METHOD method_3797 setForceWorldUpgrade (Z)V
ARG 1 forceWorldUpgrade
METHOD method_3798 getOpPermissionLevel ()I
METHOD method_3799 isDemo ()Z
METHOD method_3800 loadWorldDataPacks (Ljava/io/File;Lnet/minecraft/class_31;)V
ARG 1 worldDir
ARG 2 properties
METHOD method_3801 getTagManager ()Lnet/minecraft/class_3505;
METHOD method_3802 getMaxPlayerCount ()I
METHOD method_3803 setPlayerIdleTimeout (I)V
@ -235,6 +243,7 @@ CLASS net/minecraft/server/MinecraftServer
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
ARG 1 gameMode
METHOD method_3839 isNetherAllowed ()Z
METHOD method_3840 setSpawnAnimals (Z)V
ARG 1 spawnAnimals
@ -247,6 +256,7 @@ CLASS net/minecraft/server/MinecraftServer
METHOD method_3844 getSessionService ()Lcom/mojang/authlib/minecraft/MinecraftSessionService;
METHOD method_3845 getScoreboard ()Lnet/minecraft/class_2995;
METHOD method_3846 setPlayerManager (Lnet/minecraft/class_3324;)V
ARG 1 playerManager
METHOD method_3847 getWorld (Lnet/minecraft/class_2874;)Lnet/minecraft/class_3218;
METHOD method_3848 reload ()V
METHOD method_3849 setServerName (Ljava/lang/String;)V
@ -256,6 +266,7 @@ CLASS net/minecraft/server/MinecraftServer
METHOD method_3851 getAdvancementLoader ()Lnet/minecraft/class_2989;
METHOD method_3852 isPvpEnabled ()Z
METHOD method_3853 setKeyPair (Ljava/security/KeyPair;)V
ARG 1 keyPair
METHOD method_3855 getDataFixer ()Lcom/mojang/datafixers/DataFixer;
METHOD method_3856 forcePlayerSampleUpdate ()V
METHOD method_3857 getLootManager ()Lnet/minecraft/class_60;

2
mappings/net/minecraft/server/network/ServerPlayNetworkHandler.mapping
View File

@ -57,5 +57,5 @@ CLASS net/minecraft/class_3244 net/minecraft/server/network/ServerPlayNetworkHan
METHOD method_14371 validateVehicleMove (Lnet/minecraft/class_2833;)Z
METHOD method_14372 syncWithPlayerPosition ()V
METHOD method_18784 tick ()V
METHOD method_19507 isServerOwner ()Z
METHOD method_19507 isHost ()Z
METHOD method_20630 isPlayerNotCollidingWithBlocks (Lnet/minecraft/class_4538;)Z

6
mappings/net/minecraft/server/world/ServerWorld.mapping
View File

@ -4,7 +4,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
FIELD field_13950 pendingBlockActions Lit/unimi/dsi/fastutil/objects/ObjectLinkedOpenHashSet;
FIELD field_13951 fluidTickScheduler Lnet/minecraft/class_1949;
FIELD field_13952 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_13953 insideTick Z
FIELD field_13953 inBlockTick Z
FIELD field_13955 allPlayersSleeping Z
FIELD field_13956 portalForcer Lnet/minecraft/class_1946;
FIELD field_13957 savingDisabled Z
@ -17,7 +17,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
FIELD field_18261 players Ljava/util/List;
FIELD field_18262 entityNavigations Ljava/util/Set;
FIELD field_18263 wanderingTraderManager Lnet/minecraft/class_3990;
FIELD field_18264 ticking Z
FIELD field_18264 inEntityTick Z
FIELD field_18811 raidManager Lnet/minecraft/class_3767;
FIELD field_23787 structureAccessor Lnet/minecraft/class_5138;
METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;)V
@ -46,7 +46,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
METHOD method_14176 save (Lnet/minecraft/class_3536;ZZ)V
ARG 1 progressListener
ARG 2 flush
METHOD method_14177 isInsideTick ()Z
METHOD method_14177 isInBlockTick ()Z
METHOD method_14183 getStructureManager ()Lnet/minecraft/class_3485;
METHOD method_14187 placeBonusChest ()V
METHOD method_14188 saveLevel ()V

29
mappings/net/minecraft/util/math/Quaternion.mapping
View File

@ -1,11 +1,14 @@
CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion
FIELD field_21493 IDENTITY Lnet/minecraft/class_1158;
FIELD field_21585 a F
FIELD field_21582 x F
FIELD field_21583 y F
FIELD field_21584 z F
FIELD field_21585 w F
METHOD <init> (FFFF)V
ARG 1 b
ARG 2 c
ARG 3 d
ARG 4 a
ARG 1 x
ARG 2 y
ARG 3 z
ARG 4 w
METHOD <init> (FFFZ)V
ARG 1 x
ARG 2 y
@ -28,14 +31,14 @@ CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion
METHOD method_22873 normalize ()V
METHOD method_23695 copy ()Lnet/minecraft/class_1158;
METHOD method_23758 set (FFFF)V
ARG 1 a
ARG 2 b
ARG 3 c
ARG 4 d
METHOD method_4921 getB ()F
METHOD method_4922 getC ()F
METHOD method_4923 getD ()F
METHOD method_4924 getA ()F
ARG 1 x
ARG 2 y
ARG 3 z
ARG 4 w
METHOD method_4921 getX ()F
METHOD method_4922 getY ()F
METHOD method_4923 getZ ()F
METHOD method_4924 getW ()F
METHOD method_4925 hamiltonProduct (Lnet/minecraft/class_1158;)V
ARG 1 other
METHOD method_4926 conjugate ()V

3
mappings/net/minecraft/world/chunk/ProtoChunk.mapping
View File

@ -2,7 +2,7 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk
FIELD field_12909 sections [Lnet/minecraft/class_2826;
FIELD field_12911 blockTickScheduler Lnet/minecraft/class_2850;
FIELD field_12912 heightmaps Ljava/util/Map;
FIELD field_12914 isLightOn Z
FIELD field_12914 lightOn Z
FIELD field_12915 structureStarts Ljava/util/Map;
FIELD field_12916 upgradeData Lnet/minecraft/class_2843;
FIELD field_12917 blockEntities Ljava/util/Map;
@ -37,6 +37,7 @@ CLASS net/minecraft/class_2839 net/minecraft/world/chunk/ProtoChunk
ARG 1 carver
ARG 2 mask
METHOD method_12308 setStatus (Lnet/minecraft/class_2806;)V
ARG 1 status
METHOD method_12309 getBlockEntities ()Ljava/util/Map;
METHOD method_12314 joinBlockPos (SILnet/minecraft/class_1923;)Lnet/minecraft/class_2338;
ARG 0 sectionRel

4
mappings/net/minecraft/world/chunk/UpgradeData.mapping
View File

@ -27,7 +27,9 @@ CLASS net/minecraft/class_2843 net/minecraft/world/chunk/UpgradeData
METHOD method_12357 postUpdate (Lnet/minecraft/class_1936;)V
ARG 1 world
METHOD method_12358 getUpdatedState (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680;
CLASS class_2845 BulitinLogic
CLASS class_2845 BuiltinLogic
FIELD field_12959 DIRECTIONS [Lnet/minecraft/class_2350;
METHOD <init> (Ljava/lang/String;I[Lnet/minecraft/class_2248;)V
ARG 3 blocks
CLASS 4
FIELD field_12964 distanceToPositions Ljava/lang/ThreadLocal;

5
mappings/net/minecraft/world/chunk/WorldChunk.mapping
View File

@ -11,7 +11,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
FIELD field_12844 lastSaveTime J
FIELD field_12845 structureReferences Ljava/util/Map;
FIELD field_12846 pendingBlockEntityTags Ljava/util/Map;
FIELD field_12847 isLightOn Z
FIELD field_12847 lightOn Z
FIELD field_12848 pos Lnet/minecraft/class_1923;
FIELD field_12849 upgradeData Lnet/minecraft/class_2843;
FIELD field_12850 loadToWorldConsumer Ljava/util/function/Consumer;
@ -30,6 +30,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
ARG 10 loadToWorldConsumer
METHOD <init> (Lnet/minecraft/class_1937;Lnet/minecraft/class_2839;)V
ARG 1 world
ARG 2 protoChunk
METHOD method_12023 getLightingProvider ()Lnet/minecraft/class_3568;
METHOD method_12200 getWorld ()Lnet/minecraft/class_1937;
METHOD method_12201 getBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2818$class_2819;)Lnet/minecraft/class_2586;
@ -37,6 +38,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
METHOD method_12203 remove (Lnet/minecraft/class_1297;)V
METHOD method_12204 loadBlockEntity (Lnet/minecraft/class_2338;Lnet/minecraft/class_2487;)Lnet/minecraft/class_2586;
ARG 1 pos
ARG 2 tag
METHOD method_12205 getEntities (Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V
ARG 1 except
ARG 2 box
@ -45,6 +47,7 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk
METHOD method_12207 setLevelTypeProvider (Ljava/util/function/Supplier;)V
ARG 1 levelTypeProvider
METHOD method_12208 createBlockEntity (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2586;
ARG 1 pos
METHOD method_12210 getEntities (Ljava/lang/Class;Lnet/minecraft/class_238;Ljava/util/List;Ljava/util/function/Predicate;)V
ARG 1 entityClass
ARG 2 box