New sound stuff, fish hook predicate, missed persistent state uuid fix (#1202)

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

Add jd to note this is the mood percentage for biome sound

Co-authored-by: liach <liach@users.noreply.github.com>
This commit is contained in:
liach 2020-03-19 09:50:03 -05:00 committed by GitHub
parent e57e86ce75
commit e34b5a891e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 73 additions and 5 deletions

View File

@ -48,6 +48,9 @@ CLASS net/minecraft/class_746 net/minecraft/client/network/ClientPlayerEntity
METHOD method_22419 showsDeathScreen ()Z
METHOD method_22420 setShowsDeathScreen (Z)V
ARG 1 shouldShow
METHOD method_26269 getMoodPercentage ()F
COMMENT Returns the percentage for the biome mood sound for the debug HUD to
COMMENT display.
METHOD method_3130 getRecipeBook ()Lnet/minecraft/class_299;
METHOD method_3131 hasJumpingMount ()Z
METHOD method_3132 openRidingInventory ()V

View File

@ -7,10 +7,12 @@ CLASS net/minecraft/class_4897 net/minecraft/client/sound/BiomeEffectSoundPlayer
FIELD field_22801 moodSound Ljava/util/Optional;
FIELD field_22802 additionsSound Ljava/util/Optional;
FIELD field_22804 activeBiome Lnet/minecraft/class_1959;
FIELD field_23189 moodPercentage F
METHOD <init> (Lnet/minecraft/class_746;Lnet/minecraft/class_1144;Lnet/minecraft/class_4543;)V
ARG 1 player
ARG 2 soundManager
ARG 3 biomeAccess
METHOD method_26272 getMoodPercentage ()F
CLASS class_4898 MusicLoop
FIELD field_22805 delta I
FIELD field_22806 strength I

View File

@ -0,0 +1,3 @@
CLASS net/minecraft/class_4964 net/minecraft/datafixer/fix/PersistentStateUuidFix
METHOD <init> (Lcom/mojang/datafixers/schemas/Schema;)V
ARG 1 outputSchema

View File

@ -1,4 +1,5 @@
CLASS net/minecraft/class_1536 net/minecraft/entity/FishingBobberEntity
FIELD field_23134 inOpenWater Z
FIELD field_7165 hookedEntity Lnet/minecraft/class_1297;
FIELD field_7166 selfHitTimer I
FIELD field_7167 removalTimer I
@ -27,6 +28,11 @@ CLASS net/minecraft/class_1536 net/minecraft/entity/FishingBobberEntity
ARG 2 owner
ARG 3 lureLevel
ARG 4 luckOfTheSeaLevel
METHOD method_26086 isOpenOrWaterAround (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_26087 isOpenOrWater (Lnet/minecraft/class_2338;)Z
ARG 1 pos
METHOD method_26088 isInOpenWater ()Z
METHOD method_6947 getOwner ()Lnet/minecraft/class_1657;
METHOD method_6949 tickFishingLogic (Lnet/minecraft/class_2338;)V
ARG 1 pos

View File

@ -14,7 +14,7 @@ CLASS net/minecraft/class_2025 net/minecraft/predicate/entity/DistancePredicate
ARG 0 y
METHOD method_8857 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2025;
ARG 0 el
METHOD method_8858 serialize ()Lcom/google/gson/JsonElement;
METHOD method_8858 toJson ()Lcom/google/gson/JsonElement;
METHOD method_8859 test (DDDDDD)Z
METHOD method_8860 horizontal (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2025;
ARG 0 horizontal

View File

@ -7,7 +7,7 @@ CLASS net/minecraft/class_2102 net/minecraft/predicate/entity/EntityEffectPredic
METHOD method_9065 withEffect (Lnet/minecraft/class_1291;)Lnet/minecraft/class_2102;
METHOD method_9066 create ()Lnet/minecraft/class_2102;
METHOD method_9067 test (Lnet/minecraft/class_1309;)Z
METHOD method_9068 serialize ()Lcom/google/gson/JsonElement;
METHOD method_9068 toJson ()Lcom/google/gson/JsonElement;
CLASS class_2103 EffectData
FIELD field_9711 amplifier Lnet/minecraft/class_2096$class_2100;
FIELD field_9712 visible Ljava/lang/Boolean;

View File

@ -13,5 +13,5 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPre
ARG 4 feet
ARG 5 mainhand
METHOD method_16224 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_3735;
METHOD method_16225 serialize ()Lcom/google/gson/JsonElement;
METHOD method_16225 toJson ()Lcom/google/gson/JsonElement;
METHOD method_16226 test (Lnet/minecraft/class_1297;)Z

View File

@ -13,7 +13,7 @@ CLASS net/minecraft/class_2040 net/minecraft/predicate/entity/EntityFlagsPredica
METHOD method_8892 test (Lnet/minecraft/class_1297;)Z
METHOD method_8893 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2040;
ARG 0 element
METHOD method_8894 serialize ()Lcom/google/gson/JsonElement;
METHOD method_8894 toJson ()Lcom/google/gson/JsonElement;
METHOD method_8895 deserializeBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean;
ARG 0 json
ARG 1 key

View File

@ -3,6 +3,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
FIELD field_16490 equipment Lnet/minecraft/class_3735;
FIELD field_20697 player Lnet/minecraft/class_4553;
FIELD field_20698 team Ljava/lang/String;
FIELD field_23135 fishingHook Lnet/minecraft/class_4965;
FIELD field_9594 effects Lnet/minecraft/class_2102;
FIELD field_9595 type Lnet/minecraft/class_2050;
FIELD field_9596 location Lnet/minecraft/class_2090;
@ -20,23 +21,27 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
ARG 6 flags
ARG 7 equipment
ARG 8 player
ARG 9 fishingHook
METHOD method_8909 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z
ARG 1 world
ARG 2 pos
ARG 3 entity
METHOD method_8910 fromJsonArray (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2048;
ARG 0 element
METHOD method_8911 serializeAll ([Lnet/minecraft/class_2048;)Lcom/google/gson/JsonElement;
ARG 0 predicates
METHOD method_8912 serialize ()Lcom/google/gson/JsonElement;
METHOD method_8912 toJson ()Lcom/google/gson/JsonElement;
METHOD method_8913 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2048;
ARG 0 el
METHOD method_8914 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Z
ARG 1 player
ARG 2 entity
CLASS class_2049 Builder
FIELD field_16318 catType Lnet/minecraft/class_2960;
FIELD field_16491 equipment Lnet/minecraft/class_3735;
FIELD field_20699 player Lnet/minecraft/class_4553;
FIELD field_20700 team Ljava/lang/String;
FIELD field_23136 fishHook Lnet/minecraft/class_4965;
FIELD field_9602 distance Lnet/minecraft/class_2025;
FIELD field_9603 nbt Lnet/minecraft/class_2105;
FIELD field_9604 location Lnet/minecraft/class_2090;
@ -48,6 +53,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate
METHOD method_16227 equipment (Lnet/minecraft/class_3735;)Lnet/minecraft/class_2048$class_2049;
METHOD method_22469 player (Lnet/minecraft/class_4553;)Lnet/minecraft/class_2048$class_2049;
METHOD method_22470 team (Ljava/lang/String;)Lnet/minecraft/class_2048$class_2049;
METHOD method_26090 fishHook (Lnet/minecraft/class_4965;)Lnet/minecraft/class_2048$class_2049;
METHOD method_8915 nbt (Lnet/minecraft/class_2105;)Lnet/minecraft/class_2048$class_2049;
METHOD method_8916 create ()Lnet/minecraft/class_2048$class_2049;
METHOD method_8917 type (Lnet/minecraft/class_2050;)Lnet/minecraft/class_2048$class_2049;

View File

@ -0,0 +1,12 @@
CLASS net/minecraft/class_4965 net/minecraft/predicate/entity/FishingHookPredicate
FIELD field_23137 ANY Lnet/minecraft/class_4965;
FIELD field_23138 inOpenWater Z
METHOD <init> (Z)V
ARG 1 inOpenWater
METHOD method_26092 toJson ()Lcom/google/gson/JsonElement;
METHOD method_26093 test (Lnet/minecraft/class_1297;)Z
ARG 1 entity
METHOD method_26094 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4965;
ARG 0 json
METHOD method_26095 of (Z)Lnet/minecraft/class_4965;
ARG 0 inOpenWater

View File

@ -0,0 +1,10 @@
CLASS net/minecraft/class_4967 net/minecraft/sound/BiomeAdditionsSound
COMMENT Represents an "additions sound" for a biome.
FIELD field_23144 event Lnet/minecraft/class_3414;
FIELD field_23145 chance D
METHOD <init> (Lnet/minecraft/class_3414;D)V
ARG 1 event
ARG 3 chance
METHOD method_26098 getEvent ()Lnet/minecraft/class_3414;
METHOD method_26099 getChance ()D
COMMENT Returns the chance of this addition sound to play at any tick.

View File

@ -0,0 +1,26 @@
CLASS net/minecraft/class_4968 net/minecraft/sound/BiomeMoodSound
FIELD field_23146 CAVE Lnet/minecraft/class_4968;
FIELD field_23147 event Lnet/minecraft/class_3414;
FIELD field_23148 cultivationTicks I
FIELD field_23149 spawnRange I
FIELD field_23150 extraDistance D
METHOD <init> (Lnet/minecraft/class_3414;IID)V
ARG 1 event
ARG 2 cultivationTicks
ARG 3 spawnRange
ARG 7 extraDistance
METHOD method_26100 getEvent ()Lnet/minecraft/class_3414;
METHOD method_26101 getCultivationTicks ()I
COMMENT Returns the ticks it takes for entering the mood environment (a totally
COMMENT dark cave) to playing the mood sound, or the inverse of the per-tick.
METHOD method_26102 getSpawnRange ()I
COMMENT Returns the chebyshev distance from which the mood sound can play to
COMMENT the player.
METHOD method_26103 getExtraDistance ()D
COMMENT Returns the extra distance of the sound from the player when the sound
COMMENT plays from the mood position.
COMMENT
COMMENT <p>The sound is actually played at a position along the line on the
COMMENT three-dimensional vector from the player to the chosen mood position that
COMMENT is this distance to the mood position and this distance farther from the
COMMENT player.