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

Various misc changes (#1372) 

* Fix #1369

* CriteriaMerger -> CriterionMerger

* ItemRenderer.renderGuiItem + related names

Closes #1361.

* WololoGoal.purpleSheepPredicate -> convertibleSheepPredicate

Co-authored-by: liach <liach@users.noreply.github.com>

Closes #1344.

* Improve GUI item rendering names

* MinecraftClient.(block/item)ColorMap -> (block/item)Colors

* Change wording a little

* Model overrides
This commit is contained in:
Juuxel 2020-06-07 17:26:33 +03:00 committed by GitHub
parent 779b1dc2f5
commit 3eb088abba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 30 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mappings/net/minecraft/advancement/CriteriaMerger.mapping → mappings/net/minecraft/advancement/CriterionMerger.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_193 net/minecraft/advancement/CriteriaMerger
CLASS net/minecraft/class_193 net/minecraft/advancement/CriterionMerger
FIELD field_1257 OR Lnet/minecraft/class_193;
FIELD field_16882 AND Lnet/minecraft/class_193;
METHOD createRequirements (Ljava/util/Collection;)[[Ljava/lang/String;

4
mappings/net/minecraft/block/AbstractBlock.mapping
View File

@ -97,7 +97,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 2 world
ARG 3 pos
ARG 4 newState
ARG 5 notify
ARG 5 moved
METHOD method_9545 getFluidState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3610;
ARG 1 state
METHOD method_9548 onEntityCollision (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1297;)V
@ -441,7 +441,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 1 world
ARG 2 pos
ARG 3 state
ARG 4 notify
ARG 4 moved
METHOD method_26198 prepare (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;I)V
ARG 1 world
ARG 2 pos

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

@ -62,14 +62,14 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_1748 levelStorage Lnet/minecraft/class_32;
FIELD field_1749 ALT_TEXT_RENDERER_ID Lnet/minecraft/class_2960;
FIELD field_1750 lastMetricsSampleTime J
FIELD field_1751 blockColorMap Lnet/minecraft/class_324;
FIELD field_1751 blockColors Lnet/minecraft/class_324;
FIELD field_1752 itemUseCooldown I
FIELD field_1755 currentScreen Lnet/minecraft/class_437;
FIELD field_1756 blockRenderManager Lnet/minecraft/class_776;
FIELD field_1757 resourcePackDir Ljava/io/File;
FIELD field_1758 tutorialManager Lnet/minecraft/class_1156;
FIELD field_1759 isIntegratedServerRunning Z
FIELD field_1760 itemColorMap Lnet/minecraft/class_325;
FIELD field_1760 itemColors Lnet/minecraft/class_325;
FIELD field_1761 interactionManager Lnet/minecraft/class_636;
FIELD field_1762 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_1763 bakedModelManager Lnet/minecraft/class_1092;
@ -125,7 +125,7 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
ARG 2 blockEntity
METHOD method_1504 setCameraEntity (Lnet/minecraft/class_1297;)V
ARG 1 entity
METHOD method_1505 getBlockColorMap ()Lnet/minecraft/class_324;
METHOD method_1505 getBlockColors ()Lnet/minecraft/class_324;
METHOD method_1506 handleGlErrorByDisableVsync (IJ)V
ARG 1 error
ARG 2 description

28
mappings/net/minecraft/client/render/item/ItemRenderer.mapping
View File

@ -54,6 +54,19 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
ARG 4 overlay
ARG 5 matrices
ARG 6 vertices
METHOD method_27951 renderInGuiWithOverrides (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;II)V
COMMENT Renders an item in a GUI with an attached entity.
COMMENT
COMMENT <p>The entity is used to calculate model overrides for the item.
ARG 1 entity
ARG 2 stack
ARG 3 x
ARG 4 y
METHOD method_27953 renderInGui (Lnet/minecraft/class_1799;II)V
COMMENT Renders an item in a GUI without an attached entity.
ARG 1 stack
ARG 2 x
ARG 3 y
METHOD method_4004 renderGuiQuad (Lnet/minecraft/class_287;IIIIIIII)V
ARG 1 buffer
ARG 2 x
@ -79,21 +92,26 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer
ARG 3 y
ARG 4 model
METHOD method_4022 renderGuiItemOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V
ARG 1 fontRenderer
COMMENT Renders the overlay for items in GUIs, including the damage bar and the item count.
ARG 1 renderer
ARG 2 stack
ARG 3 x
ARG 4 y
ARG 5 amountText
METHOD method_4023 renderGuiItem (Lnet/minecraft/class_1799;II)V
ARG 5 countLabel
COMMENT a label for the stack; if null, the stack count is drawn instead
METHOD method_4023 renderInGuiWithOverrides (Lnet/minecraft/class_1799;II)V
COMMENT Renders an item in a GUI with the player as the attached entity
COMMENT for calculating model overrides.
ARG 1 stack
ARG 2 x
ARG 3 y
METHOD method_4025 renderGuiItemOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;II)V
ARG 1 fontRenderer
COMMENT Renders the overlay for items in GUIs, including the damage bar and the item count.
ARG 1 renderer
ARG 2 stack
ARG 3 x
ARG 4 y
METHOD method_4026 renderGuiItem (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;II)V
METHOD method_4026 innerRenderInGui (Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;II)V
ARG 1 entity
ARG 2 itemStack
ARG 3 x

2
mappings/net/minecraft/entity/mob/EvokerEntity.mapping
View File

@ -16,4 +16,4 @@ CLASS net/minecraft/class_1564 net/minecraft/entity/mob/EvokerEntity
CLASS class_1567 SummonVexGoal
FIELD field_18129 closeVexPredicate Lnet/minecraft/class_4051;
CLASS class_1568 WololoGoal
FIELD field_7269 purpleSheepPredicate Lnet/minecraft/class_4051;
FIELD field_7269 convertibleSheepPredicate Lnet/minecraft/class_4051;