diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index 5a4494840d..3f4612bf6e 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -19,15 +19,15 @@ CLASS bml net/minecraft/block/Block FIELD f resistance F FIELD g hardness F FIELD h randomTicks Z - FIELD i friction F + FIELD i slipperiness F FIELD j dropTableId Lqs; FIELD k dynamicBounds Z METHOD (Lcld;Lcle;)V ARG 1 material ARG 2 materialColor METHOD a noCollision ()Lbml$c; - METHOD a friction (F)Lbml$c; - ARG 1 friction + METHOD a slipperiness (F)Lbml$c; + ARG 1 slipperiness METHOD a strength (FF)Lbml$c; ARG 1 hardness ARG 2 resistance @@ -56,7 +56,7 @@ CLASS bml net/minecraft/block/Block FIELD a FACINGS [Lfa; FIELD b SOLID_MEDIUM_SQUARE_SHAPE Lcsp; FIELD c SOLID_SMALL_SQUARE_SHAPE Lcsp; - FIELD d friction F + FIELD d slipperiness F FIELD e defaultState Lbvj; FIELD f dynamicBounds Z FIELD g dropTableId Lqs; @@ -240,6 +240,7 @@ CLASS bml net/minecraft/block/Block ARG 3 pos ARG 4 block ARG 5 neighborPos + ARG 6 moved METHOD a dropStacks (Lbvj;Lbhh;Lev;Lbtm;)V ARG 0 state ARG 1 world @@ -288,7 +289,7 @@ CLASS bml net/minecraft/block/Block ARG 2 world ARG 3 pos ARG 4 flags - METHOD a skipRenderingSide (Lbvj;Lbvj;Lfa;)Z + METHOD a isSideInvisible (Lbvj;Lbvj;Lfa;)Z ARG 1 state ARG 2 neighbor ARG 3 facing @@ -461,7 +462,7 @@ CLASS bml net/minecraft/block/Block ARG 1 state ARG 2 view ARG 3 blockPos - METHOD m getFrictionCoefficient ()F + METHOD m getSlipperiness ()F METHOD m hasRandomTicks (Lbvj;)Z ARG 1 state METHOD n getStateFactory ()Lbvk; diff --git a/mappings/net/minecraft/block/BlockState.mapping b/mappings/net/minecraft/block/BlockState.mapping index c3b4abe494..b299e6b3f3 100644 --- a/mappings/net/minecraft/block/BlockState.mapping +++ b/mappings/net/minecraft/block/BlockState.mapping @@ -84,6 +84,7 @@ CLASS bvj net/minecraft/block/BlockState ARG 1 world ARG 2 pos ARG 3 oldState + ARG 4 moved METHOD a scheduledTick (Lbhh;Lev;Ljava/util/Random;)V ARG 1 world ARG 2 pos @@ -99,7 +100,7 @@ CLASS bvj net/minecraft/block/BlockState ARG 1 mirror METHOD a rotate (Lbqw;)Lbvj; ARG 1 rotation - METHOD a skipRenderingSide (Lbvj;Lfa;)Z + METHOD a isSideInvisible (Lbvj;Lfa;)Z ARG 1 neighbor ARG 2 facing METHOD a getDroppedStacks (Lcol$a;)Ljava/util/List; @@ -137,6 +138,7 @@ CLASS bvj net/minecraft/block/BlockState ARG 1 world ARG 2 pos ARG 3 newState + ARG 4 moved METHOD b onRandomTick (Lbhh;Lev;Ljava/util/Random;)V ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/client/audio/EntityTrackingSoundInstance.mapping b/mappings/net/minecraft/client/audio/EntityTrackingSoundInstance.mapping deleted file mode 100644 index 1636c333f6..0000000000 --- a/mappings/net/minecraft/client/audio/EntityTrackingSoundInstance.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS dwm net/minecraft/client/audio/EntityTrackingSoundInstance - FIELD o entity Laif; diff --git a/mappings/net/minecraft/client/audio/GuardianAttackSoundInstance.mapping b/mappings/net/minecraft/client/audio/GuardianAttackSoundInstance.mapping deleted file mode 100644 index 55c0768f10..0000000000 --- a/mappings/net/minecraft/client/audio/GuardianAttackSoundInstance.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS dwn net/minecraft/client/audio/GuardianAttackSoundInstance - FIELD o guardian Lauf; diff --git a/mappings/net/minecraft/client/audio/RidingMinecartSoundInstance.mapping b/mappings/net/minecraft/client/audio/RidingMinecartSoundInstance.mapping deleted file mode 100644 index ea0f550f0a..0000000000 --- a/mappings/net/minecraft/client/audio/RidingMinecartSoundInstance.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dwo net/minecraft/client/audio/RidingMinecartSoundInstance - FIELD o minecart Laxl; - FIELD p distance F diff --git a/mappings/net/minecraft/client/audio/TickableSoundInstance.mapping b/mappings/net/minecraft/client/audio/TickableSoundInstance.mapping deleted file mode 100644 index eb1af97030..0000000000 --- a/mappings/net/minecraft/client/audio/TickableSoundInstance.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS dwv net/minecraft/client/audio/TickableSoundInstance - METHOD n isDone ()Z - METHOD o tick ()V diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index bb5651dae6..af50469ec9 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -9,7 +9,7 @@ CLASS dhi net/minecraft/client/network/ClientPlayNetworkHandler FIELD i advancementHandler Ldhf; FIELD j commandSource Ldhj; FIELD k tagManager Lzd; - FIELD l queryHandler Lcvb; + FIELD l dataQueryHandler Lcvb; FIELD m chunkLoadDistance I FIELD n random Ljava/util/Random; FIELD o commandDispatcher Lcom/mojang/brigadier/CommandDispatcher; @@ -34,5 +34,5 @@ CLASS dhi net/minecraft/client/network/ClientPlayNetworkHandler METHOD h getCommandDispatcher ()Lcom/mojang/brigadier/CommandDispatcher; METHOD i getWorld ()Ldhl; METHOD j getTagManager ()Lzd; - METHOD k getQueryHandler ()Lcvb; + METHOD k getDataQueryHandler ()Lcvb; METHOD l getSessionId ()Ljava/util/UUID; diff --git a/mappings/net/minecraft/client/network/QueryHandler.mapping b/mappings/net/minecraft/client/network/DataQueryHandler.mapping similarity index 85% rename from mappings/net/minecraft/client/network/QueryHandler.mapping rename to mappings/net/minecraft/client/network/DataQueryHandler.mapping index ae155b29b8..b50972504f 100644 --- a/mappings/net/minecraft/client/network/QueryHandler.mapping +++ b/mappings/net/minecraft/client/network/DataQueryHandler.mapping @@ -1,4 +1,4 @@ -CLASS cvb net/minecraft/client/network/QueryHandler +CLASS cvb net/minecraft/client/network/DataQueryHandler FIELD a networkHandler Ldhi; FIELD b expectedTransactionId I FIELD c queryConsumer Ljava/util/function/Consumer; diff --git a/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping b/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping index 0e5bb82f17..b53a7a5e55 100644 --- a/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping +++ b/mappings/net/minecraft/client/network/DebugRendererInfoManager.mapping @@ -6,6 +6,6 @@ CLASS np net/minecraft/client/network/DebugRendererInfoManager ARG 1 mob ARG 2 goalSelector METHOD a sendPathfindingData (Lbhh;Laip;Lcng;F)V - METHOD a sendBlockUpdate (Lbhh;Lev;)V + METHOD a sendNeighborUpdate (Lbhh;Lev;)V METHOD a sendStructureStart (Lbhi;Lcil;)V METHOD c sendPointOfInterest (Lvg;Lev;)V diff --git a/mappings/net/minecraft/client/options/BooleanGameOption.mapping b/mappings/net/minecraft/client/options/BooleanOption.mapping similarity index 89% rename from mappings/net/minecraft/client/options/BooleanGameOption.mapping rename to mappings/net/minecraft/client/options/BooleanOption.mapping index 7dd2be6b45..4355b8f9e3 100644 --- a/mappings/net/minecraft/client/options/BooleanGameOption.mapping +++ b/mappings/net/minecraft/client/options/BooleanOption.mapping @@ -1,4 +1,4 @@ -CLASS cuw net/minecraft/client/options/BooleanGameOption +CLASS cuw net/minecraft/client/options/BooleanOption FIELD Q getter Ljava/util/function/Predicate; FIELD R setter Ljava/util/function/BiConsumer; METHOD (Ljava/lang/String;Ljava/util/function/Predicate;Ljava/util/function/BiConsumer;)V diff --git a/mappings/net/minecraft/client/options/CyclingOption.mapping b/mappings/net/minecraft/client/options/CyclingOption.mapping new file mode 100644 index 0000000000..5ebf2817b5 --- /dev/null +++ b/mappings/net/minecraft/client/options/CyclingOption.mapping @@ -0,0 +1,12 @@ +CLASS cva net/minecraft/client/options/CyclingOption + FIELD Q setter Ljava/util/function/BiConsumer; + FIELD R messageProvider Ljava/util/function/BiFunction; + METHOD (Ljava/lang/String;Ljava/util/function/BiConsumer;Ljava/util/function/BiFunction;)V + ARG 1 key + ARG 2 setter + ARG 3 messageProvider + METHOD a cycle (Lcvm;I)V + ARG 1 options + ARG 2 amount + METHOD c getMessage (Lcvm;)Ljava/lang/String; + ARG 1 options diff --git a/mappings/net/minecraft/client/options/DoubleGameOption.mapping b/mappings/net/minecraft/client/options/DoubleOption.mapping similarity index 92% rename from mappings/net/minecraft/client/options/DoubleGameOption.mapping rename to mappings/net/minecraft/client/options/DoubleOption.mapping index 095dd87f41..eb7a9825e3 100644 --- a/mappings/net/minecraft/client/options/DoubleGameOption.mapping +++ b/mappings/net/minecraft/client/options/DoubleOption.mapping @@ -1,4 +1,4 @@ -CLASS cvo net/minecraft/client/options/DoubleGameOption +CLASS cvo net/minecraft/client/options/DoubleOption FIELD Q interval F FIELD R min D FIELD S max D diff --git a/mappings/net/minecraft/client/options/LogarithmicGameOption.mapping b/mappings/net/minecraft/client/options/LogarithmicGameOption.mapping deleted file mode 100644 index 0f69d90eb7..0000000000 --- a/mappings/net/minecraft/client/options/LogarithmicGameOption.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS cvh net/minecraft/client/options/LogarithmicGameOption diff --git a/mappings/net/minecraft/client/options/LogarithmicOption.mapping b/mappings/net/minecraft/client/options/LogarithmicOption.mapping new file mode 100644 index 0000000000..6263dc0a2a --- /dev/null +++ b/mappings/net/minecraft/client/options/LogarithmicOption.mapping @@ -0,0 +1 @@ +CLASS cvh net/minecraft/client/options/LogarithmicOption diff --git a/mappings/net/minecraft/client/options/GameOption.mapping b/mappings/net/minecraft/client/options/Option.mapping similarity index 93% rename from mappings/net/minecraft/client/options/GameOption.mapping rename to mappings/net/minecraft/client/options/Option.mapping index 2fefb29435..a30f2a85e0 100644 --- a/mappings/net/minecraft/client/options/GameOption.mapping +++ b/mappings/net/minecraft/client/options/Option.mapping @@ -1,4 +1,4 @@ -CLASS cvl net/minecraft/client/options/GameOption +CLASS cvl net/minecraft/client/options/Option FIELD A AUTO_SUGGESTIONS Lcuw; FIELD B CHAT_COLOR Lcuw; FIELD C CHAT_LINKS Lcuw; @@ -45,7 +45,7 @@ CLASS cvl net/minecraft/client/options/GameOption METHOD (Ljava/lang/String;)V ARG 1 key METHOD a getDisplayPrefix ()Ljava/lang/String; - METHOD a createOptionButton (Lcvm;III)Lcwm; + METHOD a createButton (Lcvm;III)Lcwm; ARG 1 options ARG 2 x ARG 3 y diff --git a/mappings/net/minecraft/client/options/StringGameOption.mapping b/mappings/net/minecraft/client/options/StringGameOption.mapping deleted file mode 100644 index 84739f8743..0000000000 --- a/mappings/net/minecraft/client/options/StringGameOption.mapping +++ /dev/null @@ -1,11 +0,0 @@ -CLASS cva net/minecraft/client/options/StringGameOption - FIELD Q getter Ljava/util/function/BiConsumer; - FIELD R setter Ljava/util/function/BiFunction; - METHOD (Ljava/lang/String;Ljava/util/function/BiConsumer;Ljava/util/function/BiFunction;)V - ARG 1 key - ARG 2 getter - ARG 3 setter - METHOD a (Lcvm;I)V - ARG 1 options - METHOD c get (Lcvm;)Ljava/lang/String; - ARG 1 options diff --git a/mappings/net/minecraft/client/particle/Particle.mapping b/mappings/net/minecraft/client/particle/Particle.mapping index 1ecef5bec1..d8a1e13218 100644 --- a/mappings/net/minecraft/client/particle/Particle.mapping +++ b/mappings/net/minecraft/client/particle/Particle.mapping @@ -42,7 +42,7 @@ CLASS dit net/minecraft/client/particle/Particle ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ - METHOD a update ()V + METHOD a tick ()V METHOD a move (DDD)V ARG 1 dx ARG 3 dy @@ -61,7 +61,7 @@ CLASS dit net/minecraft/client/particle/Particle ARG 1 bufferBuilder ARG 2 camera ARG 3 tickDelta - METHOD b getTextureSheet ()Ldix; + METHOD b getType ()Ldix; METHOD b setPos (DDD)V ARG 1 x ARG 3 y diff --git a/mappings/net/minecraft/client/particle/ParticleManager.mapping b/mappings/net/minecraft/client/particle/ParticleManager.mapping index db53f41132..3f0957b6b4 100644 --- a/mappings/net/minecraft/client/particle/ParticleManager.mapping +++ b/mappings/net/minecraft/client/particle/ParticleManager.mapping @@ -4,7 +4,8 @@ CLASS div net/minecraft/client/particle/ParticleManager METHOD a setSprites (Ljava/util/List;)V ARG 1 sprites FIELD a world Lbhh; - FIELD c particleQueues Ljava/util/Map; + FIELD b PARTICLE_TEXTURE_SHEETS Ljava/util/List; + FIELD c particles Ljava/util/Map; FIELD d newEmitterParticles Ljava/util/Queue; FIELD e textureManager Lduh; FIELD f random Ljava/util/Random; @@ -43,7 +44,7 @@ CLASS div net/minecraft/client/particle/ParticleManager METHOD a registerFactory (Lge;Ldiw;)V ARG 1 type ARG 2 factory - METHOD a updateParticleQueue (Ljava/util/Collection;)V + METHOD a tickParticles (Ljava/util/Collection;)V METHOD a (Lwz$a;Lxe;Lage;Lage;Ljava/util/concurrent/Executor;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 1 helper ARG 3 prepareProfiler @@ -51,7 +52,7 @@ CLASS div net/minecraft/client/particle/ParticleManager ARG 5 prepareExecutor ARG 6 applyExecutor METHOD b tick ()V - METHOD b updateParticle (Ldit;)V + METHOD b tickParticle (Ldit;)V METHOD b createParticle (Lgd;DDDDDD)Ldit; ARG 1 parameters ARG 2 x diff --git a/mappings/net/minecraft/client/audio/AbstractSoundInstance.mapping b/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping similarity index 86% rename from mappings/net/minecraft/client/audio/AbstractSoundInstance.mapping rename to mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping index 07b97af1a1..d70df10605 100644 --- a/mappings/net/minecraft/client/audio/AbstractSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/AbstractSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dwh net/minecraft/client/audio/AbstractSoundInstance +CLASS dwh net/minecraft/client/sound/AbstractSoundInstance FIELD a sound Ldwr; FIELD b category Lyl; FIELD c id Lqs; diff --git a/mappings/net/minecraft/client/audio/AlUtil.mapping b/mappings/net/minecraft/client/sound/AlUtil.mapping similarity index 90% rename from mappings/net/minecraft/client/audio/AlUtil.mapping rename to mappings/net/minecraft/client/sound/AlUtil.mapping index 15100f7598..1c3358cd68 100644 --- a/mappings/net/minecraft/client/audio/AlUtil.mapping +++ b/mappings/net/minecraft/client/sound/AlUtil.mapping @@ -1,4 +1,4 @@ -CLASS ctg net/minecraft/client/audio/AlUtil +CLASS ctg net/minecraft/client/sound/AlUtil FIELD a LOGGER Lorg/apache/logging/log4j/Logger; METHOD a getErrorMessage (I)Ljava/lang/String; ARG 0 errorCode diff --git a/mappings/net/minecraft/client/audio/AmbientSoundLoops.mapping b/mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping similarity index 77% rename from mappings/net/minecraft/client/audio/AmbientSoundLoops.mapping rename to mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping index 0e00adf3c0..d836058bef 100644 --- a/mappings/net/minecraft/client/audio/AmbientSoundLoops.mapping +++ b/mappings/net/minecraft/client/sound/AmbientSoundLoops.mapping @@ -1,4 +1,4 @@ -CLASS dwx net/minecraft/client/audio/AmbientSoundLoops +CLASS dwx net/minecraft/client/sound/AmbientSoundLoops CLASS dwx$a MusicLoop FIELD o player Ldjv; METHOD (Ldjv;Lyj;)V diff --git a/mappings/net/minecraft/client/audio/AmbientSoundPlayer.mapping b/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping similarity index 57% rename from mappings/net/minecraft/client/audio/AmbientSoundPlayer.mapping rename to mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping index 5c95858347..bf07eeffca 100644 --- a/mappings/net/minecraft/client/audio/AmbientSoundPlayer.mapping +++ b/mappings/net/minecraft/client/sound/AmbientSoundPlayer.mapping @@ -1,4 +1,4 @@ -CLASS dww net/minecraft/client/audio/AmbientSoundPlayer +CLASS dww net/minecraft/client/sound/AmbientSoundPlayer FIELD a player Ldjv; FIELD b soundManager Ldxu; FIELD c ticksUntilPlay I diff --git a/mappings/net/minecraft/client/audio/AudioStream.mapping b/mappings/net/minecraft/client/sound/AudioStream.mapping similarity index 67% rename from mappings/net/minecraft/client/audio/AudioStream.mapping rename to mappings/net/minecraft/client/sound/AudioStream.mapping index 19cd55141e..2a69d1cf8d 100644 --- a/mappings/net/minecraft/client/audio/AudioStream.mapping +++ b/mappings/net/minecraft/client/sound/AudioStream.mapping @@ -1,3 +1,3 @@ -CLASS dxn net/minecraft/client/audio/AudioStream +CLASS dxn net/minecraft/client/sound/AudioStream METHOD a getFormat ()Ljavax/sound/sampled/AudioFormat; METHOD b getBuffer ()Ljava/nio/ByteBuffer; diff --git a/mappings/net/minecraft/client/audio/BubbleColumnSoundPlayer.mapping b/mappings/net/minecraft/client/sound/BubbleColumnSoundPlayer.mapping similarity index 56% rename from mappings/net/minecraft/client/audio/BubbleColumnSoundPlayer.mapping rename to mappings/net/minecraft/client/sound/BubbleColumnSoundPlayer.mapping index 62e3b8aeec..b1f10c2e20 100644 --- a/mappings/net/minecraft/client/audio/BubbleColumnSoundPlayer.mapping +++ b/mappings/net/minecraft/client/sound/BubbleColumnSoundPlayer.mapping @@ -1,4 +1,4 @@ -CLASS dwk net/minecraft/client/audio/BubbleColumnSoundPlayer +CLASS dwk net/minecraft/client/sound/BubbleColumnSoundPlayer FIELD a player Ldjv; FIELD b hasPlayedForCurrentColumn Z FIELD c firstTick Z diff --git a/mappings/net/minecraft/client/audio/Channel.mapping b/mappings/net/minecraft/client/sound/Channel.mapping similarity index 92% rename from mappings/net/minecraft/client/audio/Channel.mapping rename to mappings/net/minecraft/client/sound/Channel.mapping index a6c17e4236..dd0ac10841 100644 --- a/mappings/net/minecraft/client/audio/Channel.mapping +++ b/mappings/net/minecraft/client/sound/Channel.mapping @@ -1,4 +1,4 @@ -CLASS dxo net/minecraft/client/audio/Channel +CLASS dxo net/minecraft/client/sound/Channel CLASS dxo$a SourceManager FIELD b source Lctc; FIELD c stopped Z diff --git a/mappings/net/minecraft/client/audio/ElytraSoundInstance.mapping b/mappings/net/minecraft/client/sound/ElytraSoundInstance.mapping similarity index 58% rename from mappings/net/minecraft/client/audio/ElytraSoundInstance.mapping rename to mappings/net/minecraft/client/sound/ElytraSoundInstance.mapping index bd2ec4e996..ce11ca0476 100644 --- a/mappings/net/minecraft/client/audio/ElytraSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/ElytraSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dwl net/minecraft/client/audio/ElytraSoundInstance +CLASS dwl net/minecraft/client/sound/ElytraSoundInstance FIELD o player Ldjv; FIELD p tickCount I METHOD (Ldjv;)V diff --git a/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping b/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping new file mode 100644 index 0000000000..d39fe1061d --- /dev/null +++ b/mappings/net/minecraft/client/sound/EntityTrackingSoundInstance.mapping @@ -0,0 +1,2 @@ +CLASS dwm net/minecraft/client/sound/EntityTrackingSoundInstance + FIELD o entity Laif; diff --git a/mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping b/mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping new file mode 100644 index 0000000000..c449be007b --- /dev/null +++ b/mappings/net/minecraft/client/sound/GuardianAttackSoundInstance.mapping @@ -0,0 +1,2 @@ +CLASS dwn net/minecraft/client/sound/GuardianAttackSoundInstance + FIELD o guardian Lauf; diff --git a/mappings/net/minecraft/client/audio/Listener.mapping b/mappings/net/minecraft/client/sound/Listener.mapping similarity index 82% rename from mappings/net/minecraft/client/audio/Listener.mapping rename to mappings/net/minecraft/client/sound/Listener.mapping index e643f76521..617b5af9a1 100644 --- a/mappings/net/minecraft/client/audio/Listener.mapping +++ b/mappings/net/minecraft/client/sound/Listener.mapping @@ -1,4 +1,4 @@ -CLASS cte net/minecraft/client/audio/Listener +CLASS cte net/minecraft/client/sound/Listener FIELD b volume F METHOD a getVolume ()F METHOD a setVolume (F)V diff --git a/mappings/net/minecraft/client/audio/ListenerSoundInstance.mapping b/mappings/net/minecraft/client/sound/ListenerSoundInstance.mapping similarity index 53% rename from mappings/net/minecraft/client/audio/ListenerSoundInstance.mapping rename to mappings/net/minecraft/client/sound/ListenerSoundInstance.mapping index 02c082a11e..3bb3453360 100644 --- a/mappings/net/minecraft/client/audio/ListenerSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/ListenerSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dxt net/minecraft/client/audio/ListenerSoundInstance +CLASS dxt net/minecraft/client/sound/ListenerSoundInstance METHOD a onSoundPlayed (Ldwu;Ldxv;)V ARG 1 sound ARG 2 soundSet diff --git a/mappings/net/minecraft/client/audio/MinecartSoundInstance.mapping b/mappings/net/minecraft/client/sound/MinecartSoundInstance.mapping similarity index 64% rename from mappings/net/minecraft/client/audio/MinecartSoundInstance.mapping rename to mappings/net/minecraft/client/sound/MinecartSoundInstance.mapping index d65854047d..3cca5ace12 100644 --- a/mappings/net/minecraft/client/audio/MinecartSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/MinecartSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dwp net/minecraft/client/audio/MinecartSoundInstance +CLASS dwp net/minecraft/client/sound/MinecartSoundInstance FIELD o player Lavx; FIELD p minecart Laxl; METHOD (Lavx;Laxl;)V diff --git a/mappings/net/minecraft/client/audio/MovingSoundInstance.mapping b/mappings/net/minecraft/client/sound/MovingSoundInstance.mapping similarity index 50% rename from mappings/net/minecraft/client/audio/MovingSoundInstance.mapping rename to mappings/net/minecraft/client/sound/MovingSoundInstance.mapping index 4a33f43f9e..a14e4fd7b8 100644 --- a/mappings/net/minecraft/client/audio/MovingSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/MovingSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dwi net/minecraft/client/audio/MovingSoundInstance +CLASS dwi net/minecraft/client/sound/MovingSoundInstance FIELD n done Z METHOD (Lyj;Lyl;)V ARG 1 sound diff --git a/mappings/net/minecraft/client/audio/MusicTracker.mapping b/mappings/net/minecraft/client/sound/MusicTracker.mapping similarity index 91% rename from mappings/net/minecraft/client/audio/MusicTracker.mapping rename to mappings/net/minecraft/client/sound/MusicTracker.mapping index 1c663eb189..8334fa90c4 100644 --- a/mappings/net/minecraft/client/audio/MusicTracker.mapping +++ b/mappings/net/minecraft/client/sound/MusicTracker.mapping @@ -1,4 +1,4 @@ -CLASS dxp net/minecraft/client/audio/MusicTracker +CLASS dxp net/minecraft/client/sound/MusicTracker CLASS dxp$a MusicType FIELD i sound Lyj; FIELD j minDelay I diff --git a/mappings/net/minecraft/client/audio/OggAudioStream.mapping b/mappings/net/minecraft/client/sound/OggAudioStream.mapping similarity index 92% rename from mappings/net/minecraft/client/audio/OggAudioStream.mapping rename to mappings/net/minecraft/client/sound/OggAudioStream.mapping index c0fc0ddc6c..16221394c7 100644 --- a/mappings/net/minecraft/client/audio/OggAudioStream.mapping +++ b/mappings/net/minecraft/client/sound/OggAudioStream.mapping @@ -1,4 +1,4 @@ -CLASS ctf net/minecraft/client/audio/OggAudioStream +CLASS ctf net/minecraft/client/sound/OggAudioStream CLASS ctf$a ChannelList FIELD a buffers Ljava/util/List; FIELD b size I diff --git a/mappings/net/minecraft/client/audio/PositionedSoundInstance.mapping b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping similarity index 92% rename from mappings/net/minecraft/client/audio/PositionedSoundInstance.mapping rename to mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping index 75ca6a8a1e..13fca75093 100644 --- a/mappings/net/minecraft/client/audio/PositionedSoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/PositionedSoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dwq net/minecraft/client/audio/PositionedSoundInstance +CLASS dwq net/minecraft/client/sound/PositionedSoundInstance METHOD (Lqs;Lyl;FFZILdwu$a;FFFZ)V ARG 1 id ARG 2 category diff --git a/mappings/net/minecraft/client/sound/RidingMinecartSoundInstance.mapping b/mappings/net/minecraft/client/sound/RidingMinecartSoundInstance.mapping new file mode 100644 index 0000000000..17b02c4ac7 --- /dev/null +++ b/mappings/net/minecraft/client/sound/RidingMinecartSoundInstance.mapping @@ -0,0 +1,3 @@ +CLASS dwo net/minecraft/client/sound/RidingMinecartSoundInstance + FIELD o minecart Laxl; + FIELD p distance F diff --git a/mappings/net/minecraft/client/audio/Sound.mapping b/mappings/net/minecraft/client/sound/Sound.mapping similarity index 94% rename from mappings/net/minecraft/client/audio/Sound.mapping rename to mappings/net/minecraft/client/sound/Sound.mapping index 6a036ccc0e..b2a6d0ec12 100644 --- a/mappings/net/minecraft/client/audio/Sound.mapping +++ b/mappings/net/minecraft/client/sound/Sound.mapping @@ -1,4 +1,4 @@ -CLASS dwr net/minecraft/client/audio/Sound +CLASS dwr net/minecraft/client/sound/Sound CLASS dwr$a RegistrationType FIELD b SOUND_EVENT Ldwr$a; FIELD c name Ljava/lang/String; diff --git a/mappings/net/minecraft/client/audio/SoundContainer.mapping b/mappings/net/minecraft/client/sound/SoundContainer.mapping similarity index 68% rename from mappings/net/minecraft/client/audio/SoundContainer.mapping rename to mappings/net/minecraft/client/sound/SoundContainer.mapping index a9796b8d6f..0b1e11ec5f 100644 --- a/mappings/net/minecraft/client/audio/SoundContainer.mapping +++ b/mappings/net/minecraft/client/sound/SoundContainer.mapping @@ -1,4 +1,4 @@ -CLASS dxw net/minecraft/client/audio/SoundContainer +CLASS dxw net/minecraft/client/sound/SoundContainer METHOD a preload (Ldxr;)V ARG 1 soundSystem METHOD e getWeight ()I diff --git a/mappings/net/minecraft/client/audio/SoundEngine.mapping b/mappings/net/minecraft/client/sound/SoundEngine.mapping similarity index 94% rename from mappings/net/minecraft/client/audio/SoundEngine.mapping rename to mappings/net/minecraft/client/sound/SoundEngine.mapping index 6f703513a9..c03a45ed8c 100644 --- a/mappings/net/minecraft/client/audio/SoundEngine.mapping +++ b/mappings/net/minecraft/client/sound/SoundEngine.mapping @@ -1,4 +1,4 @@ -CLASS ctd net/minecraft/client/audio/SoundEngine +CLASS ctd net/minecraft/client/sound/SoundEngine CLASS ctd$a SourceSet METHOD a createSource ()Lctc; METHOD a release (Lctc;)Z diff --git a/mappings/net/minecraft/client/audio/SoundEntry.mapping b/mappings/net/minecraft/client/sound/SoundEntry.mapping similarity index 86% rename from mappings/net/minecraft/client/audio/SoundEntry.mapping rename to mappings/net/minecraft/client/sound/SoundEntry.mapping index e3b2e4be44..387e3ed5e8 100644 --- a/mappings/net/minecraft/client/audio/SoundEntry.mapping +++ b/mappings/net/minecraft/client/sound/SoundEntry.mapping @@ -1,4 +1,4 @@ -CLASS dws net/minecraft/client/audio/SoundEntry +CLASS dws net/minecraft/client/sound/SoundEntry FIELD a sounds Ljava/util/List; FIELD b replace Z FIELD c subtitle Ljava/lang/String; diff --git a/mappings/net/minecraft/client/audio/SoundEntryDeserializer.mapping b/mappings/net/minecraft/client/sound/SoundEntryDeserializer.mapping similarity index 88% rename from mappings/net/minecraft/client/audio/SoundEntryDeserializer.mapping rename to mappings/net/minecraft/client/sound/SoundEntryDeserializer.mapping index 17bc89e641..06e764e678 100644 --- a/mappings/net/minecraft/client/audio/SoundEntryDeserializer.mapping +++ b/mappings/net/minecraft/client/sound/SoundEntryDeserializer.mapping @@ -1,4 +1,4 @@ -CLASS dwt net/minecraft/client/audio/SoundEntryDeserializer +CLASS dwt net/minecraft/client/sound/SoundEntryDeserializer METHOD a deserializeSounds (Lcom/google/gson/JsonObject;)Ljava/util/List; ARG 1 json METHOD a deserializeType (Lcom/google/gson/JsonObject;Ldwr$a;)Ldwr$a; diff --git a/mappings/net/minecraft/client/audio/SoundExecutor.mapping b/mappings/net/minecraft/client/sound/SoundExecutor.mapping similarity index 74% rename from mappings/net/minecraft/client/audio/SoundExecutor.mapping rename to mappings/net/minecraft/client/sound/SoundExecutor.mapping index 56cd366d82..a4c7af2b7a 100644 --- a/mappings/net/minecraft/client/audio/SoundExecutor.mapping +++ b/mappings/net/minecraft/client/sound/SoundExecutor.mapping @@ -1,4 +1,4 @@ -CLASS dxs net/minecraft/client/audio/SoundExecutor +CLASS dxs net/minecraft/client/sound/SoundExecutor FIELD a thread Ljava/lang/Thread; FIELD b stopped Z METHOD a restart ()V diff --git a/mappings/net/minecraft/client/audio/SoundInstance.mapping b/mappings/net/minecraft/client/sound/SoundInstance.mapping similarity index 89% rename from mappings/net/minecraft/client/audio/SoundInstance.mapping rename to mappings/net/minecraft/client/sound/SoundInstance.mapping index 2482c5cb1c..4d51c99374 100644 --- a/mappings/net/minecraft/client/audio/SoundInstance.mapping +++ b/mappings/net/minecraft/client/sound/SoundInstance.mapping @@ -1,4 +1,4 @@ -CLASS dwu net/minecraft/client/audio/SoundInstance +CLASS dwu net/minecraft/client/sound/SoundInstance CLASS dwu$a AttenuationType METHOD a getId ()Lqs; METHOD a getSoundSet (Ldxu;)Ldxv; diff --git a/mappings/net/minecraft/client/audio/SoundLoader.mapping b/mappings/net/minecraft/client/sound/SoundLoader.mapping similarity index 88% rename from mappings/net/minecraft/client/audio/SoundLoader.mapping rename to mappings/net/minecraft/client/sound/SoundLoader.mapping index 62fffd3143..e2aaed34e2 100644 --- a/mappings/net/minecraft/client/audio/SoundLoader.mapping +++ b/mappings/net/minecraft/client/sound/SoundLoader.mapping @@ -1,4 +1,4 @@ -CLASS dxq net/minecraft/client/audio/SoundLoader +CLASS dxq net/minecraft/client/sound/SoundLoader FIELD a resourceManager Lxe; FIELD b loadedSounds Ljava/util/Map; METHOD (Lxe;)V diff --git a/mappings/net/minecraft/client/audio/SoundManager.mapping b/mappings/net/minecraft/client/sound/SoundManager.mapping similarity index 95% rename from mappings/net/minecraft/client/audio/SoundManager.mapping rename to mappings/net/minecraft/client/sound/SoundManager.mapping index bf45c395c5..705609273d 100644 --- a/mappings/net/minecraft/client/audio/SoundManager.mapping +++ b/mappings/net/minecraft/client/sound/SoundManager.mapping @@ -1,4 +1,4 @@ -CLASS dxu net/minecraft/client/audio/SoundManager +CLASS dxu net/minecraft/client/sound/SoundManager CLASS dxu$a SoundList FIELD a loadedSounds Ljava/util/Map; METHOD a addTo (Ljava/util/Map;Ldxr;)V diff --git a/mappings/net/minecraft/client/audio/SoundSystem.mapping b/mappings/net/minecraft/client/sound/SoundSystem.mapping similarity index 96% rename from mappings/net/minecraft/client/audio/SoundSystem.mapping rename to mappings/net/minecraft/client/sound/SoundSystem.mapping index e1149ed088..8d80bac095 100644 --- a/mappings/net/minecraft/client/audio/SoundSystem.mapping +++ b/mappings/net/minecraft/client/sound/SoundSystem.mapping @@ -1,4 +1,4 @@ -CLASS dxr net/minecraft/client/audio/SoundSystem +CLASS dxr net/minecraft/client/sound/SoundSystem FIELD a MARKER Lorg/apache/logging/log4j/Marker; FIELD b LOGGER Lorg/apache/logging/log4j/Logger; FIELD c unknownSounds Ljava/util/Set; diff --git a/mappings/net/minecraft/client/audio/Source.mapping b/mappings/net/minecraft/client/sound/Source.mapping similarity index 94% rename from mappings/net/minecraft/client/audio/Source.mapping rename to mappings/net/minecraft/client/sound/Source.mapping index 0530e84225..b6dc6d2e9a 100644 --- a/mappings/net/minecraft/client/audio/Source.mapping +++ b/mappings/net/minecraft/client/sound/Source.mapping @@ -1,4 +1,4 @@ -CLASS ctc net/minecraft/client/audio/Source +CLASS ctc net/minecraft/client/sound/Source FIELD a LOGGER Lorg/apache/logging/log4j/Logger; FIELD b pointer I FIELD c playing Ljava/util/concurrent/atomic/AtomicBoolean; diff --git a/mappings/net/minecraft/client/audio/StaticSound.mapping b/mappings/net/minecraft/client/sound/StaticSound.mapping similarity index 88% rename from mappings/net/minecraft/client/audio/StaticSound.mapping rename to mappings/net/minecraft/client/sound/StaticSound.mapping index 0ef7c8e7a8..f3d46627d6 100644 --- a/mappings/net/minecraft/client/audio/StaticSound.mapping +++ b/mappings/net/minecraft/client/sound/StaticSound.mapping @@ -1,4 +1,4 @@ -CLASS cth net/minecraft/client/audio/StaticSound +CLASS cth net/minecraft/client/sound/StaticSound FIELD a sample Ljava/nio/ByteBuffer; FIELD b format Ljavax/sound/sampled/AudioFormat; FIELD c hasBuffer Z diff --git a/mappings/net/minecraft/client/sound/TickableSoundInstance.mapping b/mappings/net/minecraft/client/sound/TickableSoundInstance.mapping new file mode 100644 index 0000000000..bc04d9a74d --- /dev/null +++ b/mappings/net/minecraft/client/sound/TickableSoundInstance.mapping @@ -0,0 +1,3 @@ +CLASS dwv net/minecraft/client/sound/TickableSoundInstance + METHOD n isDone ()Z + METHOD o tick ()V diff --git a/mappings/net/minecraft/client/audio/WeightedSoundSet.mapping b/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping similarity index 79% rename from mappings/net/minecraft/client/audio/WeightedSoundSet.mapping rename to mappings/net/minecraft/client/sound/WeightedSoundSet.mapping index 31ecc564e0..4eea0b9500 100644 --- a/mappings/net/minecraft/client/audio/WeightedSoundSet.mapping +++ b/mappings/net/minecraft/client/sound/WeightedSoundSet.mapping @@ -1,4 +1,4 @@ -CLASS dxv net/minecraft/client/audio/WeightedSoundSet +CLASS dxv net/minecraft/client/sound/WeightedSoundSet FIELD a sounds Ljava/util/List; FIELD b random Ljava/util/Random; FIELD c id Lqs; diff --git a/mappings/net/minecraft/client/texture/Sprite.mapping b/mappings/net/minecraft/client/texture/Sprite.mapping index 79d6f5fca1..c4839e1516 100644 --- a/mappings/net/minecraft/client/texture/Sprite.mapping +++ b/mappings/net/minecraft/client/texture/Sprite.mapping @@ -2,12 +2,13 @@ CLASS dug net/minecraft/client/texture/Sprite FIELD a width I FIELD b height I FIELD c images [Lctw; - FIELD d frameOffsets [I + FIELD d frameXs [I + FIELD e frameYs [I FIELD f interpolatedImages [Lctw; FIELD g x I FIELD h y I - FIELD i framePos I - FIELD j ticks I + FIELD i frameIndex I + FIELD j frameTicks I FIELD k id Lqs; FIELD l animationMetadata Ldvi; FIELD m uMin F @@ -27,6 +28,10 @@ CLASS dug net/minecraft/client/texture/Sprite METHOD a isDivisibleBy (II)Z ARG 0 number ARG 1 divisor + METHOD a isPixelTransparent (III)Z + ARG 1 frame + ARG 2 x + ARG 3 y METHOD a init (IIII)V ARG 1 width ARG 2 height @@ -60,6 +65,7 @@ CLASS dug net/minecraft/client/texture/Sprite METHOD c srgbToLinear (I)F METHOD c getFramePixel (IIII)I ARG 1 frame + ARG 2 image ARG 3 x ARG 4 y METHOD d upload (I)V @@ -71,7 +77,7 @@ CLASS dug net/minecraft/client/texture/Sprite METHOD k getMinV ()F METHOD l getMaxV ()F METHOD m getId ()Lqs; - METHOD n tick ()V + METHOD n tickAnimation ()V METHOD o getFrameCount ()I METHOD p isAnimated ()Z METHOD q upload ()V diff --git a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping index b9fed6e315..1b4fbbf95c 100644 --- a/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping +++ b/mappings/net/minecraft/client/texture/SpriteAtlasTexture.mapping @@ -1,5 +1,9 @@ CLASS duf net/minecraft/client/texture/SpriteAtlasTexture CLASS duf$a Data + FIELD a spriteIds Ljava/util/Set; + FIELD b width I + FIELD c height I + FIELD d sprites Ljava/util/List; FIELD f BLOCK_ATLAS_TEX Lqs; FIELD g PARTICLE_ATLAS_TEX Lqs; FIELD h PAINTING_ATLAS_TEX Lqs; @@ -8,11 +12,11 @@ CLASS duf net/minecraft/client/texture/SpriteAtlasTexture FIELD k animatedSprites Ljava/util/List; FIELD l spritesToLoad Ljava/util/Set; FIELD m sprites Ljava/util/Map; - FIELD n pathPrefix Ljava/lang/String; + FIELD n atlasPath Ljava/lang/String; FIELD o maxTextureSize I FIELD p mipLevel I FIELD q missingSprite Ldug; - METHOD a updateAnimatedSprites ()V + METHOD a tickAnimatedSprites ()V METHOD a setMipLevel (I)V METHOD a upload (Lduf$a;)V METHOD a getSprite (Ljava/lang/String;)Ldug; diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index 5824d97d7d..7c5969c52d 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -14,6 +14,7 @@ CLASS bfi net/minecraft/enchantment/Enchantment ARG 3 slotTypes METHOD a getMaximumLevel ()I METHOD a getMinimumPower (I)I + ARG 1 level METHOD a getProtectionAmount (ILaho;)I ARG 1 level ARG 2 source diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 3ac4d4a815..8ae2f4a8be 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -203,7 +203,7 @@ CLASS aio net/minecraft/entity/LivingEntity METHOD d setSleepingPosition (Lev;)V METHOD da getMovementSpeed ()F METHOD db tickNewAi ()V - METHOD dc doPushLogic ()V + METHOD dc tickPushing ()V METHOD dd isUsingRiptide ()Z METHOD de canMoveVoluntarily ()Z METHOD df getAbsorptionAmount ()F @@ -238,7 +238,7 @@ CLASS aio net/minecraft/entity/LivingEntity METHOD f getArrowType (Lbca;)Lbca; METHOD g playEquipmentBreakEffects (Lbca;)V ARG 1 item - METHOD k updateState ()V + METHOD k tickMovement ()V METHOD k getNextBreathInWater (I)I ARG 1 breath METHOD l getHandSwingDuration ()I @@ -261,6 +261,6 @@ CLASS aio net/minecraft/entity/LivingEntity ARG 1 tickDelta METHOD q setAbsorptionAmount (F)V ARG 1 amount - METHOD v_ isChild ()Z + METHOD v_ isBaby ()Z METHOD w_ isClimbing ()Z METHOD z onAttacking (Laif;)V diff --git a/mappings/net/minecraft/particle/BlockStateParticleParameters.mapping b/mappings/net/minecraft/particle/BlockStateParticleEffect.mapping similarity index 73% rename from mappings/net/minecraft/particle/BlockStateParticleParameters.mapping rename to mappings/net/minecraft/particle/BlockStateParticleEffect.mapping index ddf49fea84..09aca38ca4 100644 --- a/mappings/net/minecraft/particle/BlockStateParticleParameters.mapping +++ b/mappings/net/minecraft/particle/BlockStateParticleEffect.mapping @@ -1,4 +1,4 @@ -CLASS ga net/minecraft/particle/BlockStateParticleParameters +CLASS ga net/minecraft/particle/BlockStateParticleEffect FIELD a PARAMETERS_FACTORY Lgd$a; FIELD b type Lge; FIELD c blockState Lbvj; diff --git a/mappings/net/minecraft/particle/DustParticleParameters.mapping b/mappings/net/minecraft/particle/DustParticleEffect.mapping similarity index 83% rename from mappings/net/minecraft/particle/DustParticleParameters.mapping rename to mappings/net/minecraft/particle/DustParticleEffect.mapping index 26adc2764e..77fafbdaa6 100644 --- a/mappings/net/minecraft/particle/DustParticleParameters.mapping +++ b/mappings/net/minecraft/particle/DustParticleEffect.mapping @@ -1,4 +1,4 @@ -CLASS gb net/minecraft/particle/DustParticleParameters +CLASS gb net/minecraft/particle/DustParticleEffect FIELD a RED Lgb; FIELD b PARAMETERS_FACTORY Lgd$a; FIELD c red F diff --git a/mappings/net/minecraft/particle/ItemStackParticleParameters.mapping b/mappings/net/minecraft/particle/ItemStackParticleEffect.mapping similarity index 54% rename from mappings/net/minecraft/particle/ItemStackParticleParameters.mapping rename to mappings/net/minecraft/particle/ItemStackParticleEffect.mapping index c686d4f6c0..01a06d70d0 100644 --- a/mappings/net/minecraft/particle/ItemStackParticleParameters.mapping +++ b/mappings/net/minecraft/particle/ItemStackParticleEffect.mapping @@ -1,8 +1,8 @@ -CLASS gc net/minecraft/particle/ItemStackParticleParameters +CLASS gc net/minecraft/particle/ItemStackParticleEffect FIELD a PARAMETERS_FACTORY Lgd$a; - FIELD b particleType Lge; + FIELD b type Lge; FIELD c stack Lbca; METHOD (Lge;Lbca;)V - ARG 1 particleType + ARG 1 type ARG 2 stack METHOD c getItemStack ()Lbca; diff --git a/mappings/net/minecraft/particle/ParticleParameters.mapping b/mappings/net/minecraft/particle/ParticleEffect.mapping similarity index 84% rename from mappings/net/minecraft/particle/ParticleParameters.mapping rename to mappings/net/minecraft/particle/ParticleEffect.mapping index ae5708ef04..3442bffca7 100644 --- a/mappings/net/minecraft/particle/ParticleParameters.mapping +++ b/mappings/net/minecraft/particle/ParticleEffect.mapping @@ -1,4 +1,4 @@ -CLASS gd net/minecraft/particle/ParticleParameters +CLASS gd net/minecraft/particle/ParticleEffect CLASS gd$a Factory METHOD b read (Lge;Lcom/mojang/brigadier/StringReader;)Lgd; ARG 1 type diff --git a/mappings/net/minecraft/util/Unit.mapping b/mappings/net/minecraft/util/Unit.mapping new file mode 100644 index 0000000000..09f63091e8 --- /dev/null +++ b/mappings/net/minecraft/util/Unit.mapping @@ -0,0 +1 @@ +CLASS aaa net/minecraft/util/Unit diff --git a/mappings/net/minecraft/util/Void.mapping b/mappings/net/minecraft/util/Void.mapping deleted file mode 100644 index 89e9b50271..0000000000 --- a/mappings/net/minecraft/util/Void.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS aaa net/minecraft/util/Void diff --git a/mappings/net/minecraft/world/chunk/ChunkPos.mapping b/mappings/net/minecraft/util/math/ChunkPos.mapping similarity index 95% rename from mappings/net/minecraft/world/chunk/ChunkPos.mapping rename to mappings/net/minecraft/util/math/ChunkPos.mapping index 58da95ac15..15e13317e6 100644 --- a/mappings/net/minecraft/world/chunk/ChunkPos.mapping +++ b/mappings/net/minecraft/util/math/ChunkPos.mapping @@ -1,4 +1,4 @@ -CLASS bgt net/minecraft/world/chunk/ChunkPos +CLASS bgt net/minecraft/util/math/ChunkPos CLASS bgt$1 METHOD tryAdvance (Ljava/util/function/Consumer;)Z ARG 1 consumer diff --git a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping index fd4fcecc02..37c2af72d9 100644 --- a/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/biome/DefaultBiomeFeatures.mapping @@ -19,7 +19,7 @@ CLASS bif net/minecraft/world/biome/DefaultBiomeFeatures ARG 0 biome METHOD J addSavannaTallGrass (Lbie;)V ARG 0 biome - METHOD K addShatteredSavanaGrass (Lbie;)V + METHOD K addShatteredSavannaGrass (Lbie;)V ARG 0 biome METHOD L addSavannaGrass (Lbie;)V ARG 0 biome