diff --git a/build.gradle b/build.gradle index b5fc39c266..3b749ce6c0 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "22w03a" +def minecraft_version = "22w05a" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping index 48658baf3e..058eb103ed 100644 --- a/mappings/net/minecraft/block/PointedDripstoneBlock.mapping +++ b/mappings/net/minecraft/block/PointedDripstoneBlock.mapping @@ -36,10 +36,6 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock ARG 1 world ARG 2 pos ARG 3 dripChance - METHOD method_32773 scheduleFall (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)V - ARG 1 state - ARG 2 world - ARG 3 pos METHOD method_32774 isPointedDripstoneFacingDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z ARG 0 state ARG 1 direction @@ -80,10 +76,6 @@ CLASS net/minecraft/class_5689 net/minecraft/block/PointedDripstoneBlock ARG 0 world ARG 1 pos ARG 2 state - METHOD method_32900 getStalactiteSize (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;I)I - ARG 0 world - ARG 1 pos - ARG 2 range METHOD method_33270 (FLnet/minecraft/class_3611;)Z ARG 1 fluid METHOD method_33271 getDripFluid (Lnet/minecraft/class_1937;Lnet/minecraft/class_3611;)Lnet/minecraft/class_3611; diff --git a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping index 28a9862dc0..199e7b6fe5 100644 --- a/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/CustomizeBuffetLevelScreen.mapping @@ -20,10 +20,8 @@ CLASS net/minecraft/class_415 net/minecraft/client/gui/screen/CustomizeBuffetLev ARG 1 entry CLASS class_4190 BuffetBiomesListWidget FIELD field_18736 screen Lnet/minecraft/class_415; - METHOD method_28060 (Ljava/util/Map$Entry;)V + METHOD method_28060 (Ljava/util/Map$Entry;)Lnet/minecraft/class_415$class_4190$class_4191; ARG 1 entry - METHOD method_28061 (Ljava/util/Map$Entry;)Ljava/lang/String; - ARG 0 entry CLASS class_4191 BuffetBiomeItem FIELD field_24564 biome Lnet/minecraft/class_1959; FIELD field_26536 text Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping index c92750cd92..6da5c885eb 100644 --- a/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping +++ b/mappings/net/minecraft/client/render/block/BlockRenderManager.mapping @@ -19,11 +19,10 @@ CLASS net/minecraft/class_776 net/minecraft/client/render/block/BlockRenderManag ARG 1 state METHOD method_3350 getModelRenderer ()Lnet/minecraft/class_778; METHOD method_3351 getModels ()Lnet/minecraft/class_773; - METHOD method_3352 renderFluid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4588;Lnet/minecraft/class_3610;)Z + METHOD method_3352 renderFluid (Lnet/minecraft/class_2338;Lnet/minecraft/class_1920;Lnet/minecraft/class_4588;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z ARG 1 pos ARG 2 world ARG 3 vertexConsumer - ARG 4 state METHOD method_3353 renderBlockAsEntity (Lnet/minecraft/class_2680;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V ARG 1 state ARG 2 matrices diff --git a/mappings/net/minecraft/client/render/block/FluidRenderer.mapping b/mappings/net/minecraft/client/render/block/FluidRenderer.mapping index 2c143f89d3..1ec930f2eb 100644 --- a/mappings/net/minecraft/client/render/block/FluidRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/FluidRenderer.mapping @@ -13,9 +13,8 @@ CLASS net/minecraft/class_775 net/minecraft/client/render/block/FluidRenderer ARG 11 u ARG 12 v ARG 13 light - METHOD method_29708 shouldRenderSide (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z + METHOD method_29708 shouldRenderSide (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;Lnet/minecraft/class_3610;Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;Lnet/minecraft/class_3610;)Z ARG 0 world - ARG 1 pos ARG 2 fluidState ARG 3 blockState ARG 4 direction @@ -32,23 +31,12 @@ CLASS net/minecraft/class_775 net/minecraft/client/render/block/FluidRenderer METHOD method_3343 getLight (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I ARG 1 world ARG 2 pos - METHOD method_3344 isSideCovered (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;F)Z - ARG 0 world - ARG 1 pos + METHOD method_3344 isSideCovered (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;FLnet/minecraft/class_2680;)Z ARG 2 direction ARG 3 maxDeviation METHOD method_3345 onResourceReload ()V - METHOD method_3346 getNorthWestCornerFluidHeight (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_3611;)F - ARG 1 world - ARG 2 pos - ARG 3 fluid - METHOD method_3347 render (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;Lnet/minecraft/class_4588;Lnet/minecraft/class_3610;)Z + METHOD method_3347 render (Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;Lnet/minecraft/class_4588;Lnet/minecraft/class_2680;Lnet/minecraft/class_3610;)Z ARG 1 world ARG 2 pos ARG 3 vertexConsumer - ARG 4 state - METHOD method_3348 isSameFluid (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;Lnet/minecraft/class_3610;)Z - ARG 0 world - ARG 1 pos - ARG 2 side - ARG 3 state + METHOD method_3348 isSameFluid (Lnet/minecraft/class_3610;Lnet/minecraft/class_3610;)Z diff --git a/mappings/net/minecraft/entity/passive/GoatEntity.mapping b/mappings/net/minecraft/entity/passive/GoatEntity.mapping index 2878ad915f..5853a9f772 100644 --- a/mappings/net/minecraft/entity/passive/GoatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/GoatEntity.mapping @@ -20,9 +20,3 @@ CLASS net/minecraft/class_6053 net/minecraft/entity/passive/GoatEntity ARG 2 spawnReason ARG 3 pos ARG 4 random - CLASS class_6339 GoatPathNodeMaker - FIELD field_33489 pos Lnet/minecraft/class_2338$class_2339; - CLASS class_6340 GoatNavigation - METHOD (Lnet/minecraft/class_6053;Lnet/minecraft/class_1937;)V - ARG 1 goat - ARG 2 world diff --git a/mappings/net/minecraft/structure/MineshaftGenerator.mapping b/mappings/net/minecraft/structure/MineshaftGenerator.mapping index 03d02051f4..f96aab7021 100644 --- a/mappings/net/minecraft/structure/MineshaftGenerator.mapping +++ b/mappings/net/minecraft/structure/MineshaftGenerator.mapping @@ -58,8 +58,7 @@ CLASS net/minecraft/class_3353 net/minecraft/structure/MineshaftGenerator ARG 3 x ARG 4 y ARG 5 z - METHOD method_33777 isNotRailOrLava (Lnet/minecraft/class_2680;)Z - ARG 1 state + METHOD method_33777 isNotRailOrLava (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z METHOD method_33877 sideCoversSmallSquare (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z ARG 1 world ARG 2 pos diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 634d5c2dc0..de5e059be6 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -10,8 +10,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util FIELD field_34891 MAX_PARALLELISM I FIELD field_34892 MAX_BG_THREADS_PROPERTY Ljava/lang/String; FIELD field_34893 missingBreakpointHandler Ljava/util/function/Consumer; - METHOD method_17815 stream (Ljava/util/Optional;)Ljava/util/stream/Stream; - ARG 0 optional METHOD method_17974 ifPresentOrElse (Ljava/util/Optional;Ljava/util/function/Consumer;Ljava/lang/Runnable;)Ljava/util/Optional; ARG 0 optional ARG 1 presentAction diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index ed08d1818b..2b3e6571d0 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -43,7 +43,7 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i ARG 1 vec METHOD method_10263 getX ()I METHOD method_10264 getY ()I - METHOD method_10268 getSquaredDistance (DDDZ)D + METHOD method_10268 getSquaredDistance (DDD)D COMMENT {@return the squared distance between here (center or vertex) and {@code (x, y, z)}} COMMENT If {@code center} is {@code true}, this is equivalent to {@link Vec3d#ofCenter(Vec3i) COMMENT Vec3d.ofCenter(this).squaredDistanceTo(x, y, z)}; otherwise, @@ -51,9 +51,6 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i ARG 1 x ARG 3 y ARG 5 z - ARG 7 center - COMMENT {@code true} to calculate the distance from the voxel's center (with 0.5 block offset in all axes) - COMMENT to the given {@code (x, y, z)}; or {@code false} to calculate without an offset METHOD method_19455 getManhattanDistance (Lnet/minecraft/class_2382;)I COMMENT {@return the Manhattan distance between here and {@code vec}} COMMENT @@ -66,12 +63,9 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i COMMENT {@return whether the distance between here and {@code pos} is less than {@code distance}} ARG 1 pos ARG 2 distance - METHOD method_19770 getSquaredDistance (Lnet/minecraft/class_2374;Z)D + METHOD method_19770 getSquaredDistance (Lnet/minecraft/class_2374;)D COMMENT {@return the squared distance between here and {@code pos}} ARG 1 pos - ARG 2 center - COMMENT {@code true} to calculate the distance from the voxel's center (with 0.5 block offset in all axes) - COMMENT to the given pos; or {@code false} to calculate without an offset METHOD method_19771 isWithinDistance (Lnet/minecraft/class_2382;D)Z COMMENT {@return whether the distance between here and {@code vec} is less than {@code distance}} ARG 1 vec @@ -105,12 +99,6 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i ARG 1 distance METHOD method_30931 up ()Lnet/minecraft/class_2382; COMMENT {@return a vector which is offset by {@code 1} in the upward direction} - METHOD method_33106 getSquaredDistance (Lnet/minecraft/class_2382;Z)D - COMMENT {@return the squared distance between here and {@code vec}} - ARG 1 vec - ARG 2 center - COMMENT {@code true} to calculate the distance from the voxel's center (with 0.5 block offset in all axes) - COMMENT to the given vec; or {@code false} to calculate without an offset METHOD method_34592 add (III)Lnet/minecraft/class_2382; COMMENT {@return another Vec3i whose coordinates have the parameter x, y, and z COMMENT added to the coordinates of this vector} diff --git a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping index 37f1cf1dc1..2dc5af00a4 100644 --- a/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping +++ b/mappings/net/minecraft/world/gen/feature/ConfiguredFeature.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_2975 net/minecraft/world/gen/feature/ConfiguredFeature FIELD field_13375 config Lnet/minecraft/class_3037; FIELD field_13376 feature Lnet/minecraft/class_3031; - FIELD field_21589 LOGGER Lorg/slf4j/Logger; FIELD field_24833 REGISTRY_CODEC Lcom/mojang/serialization/Codec; FIELD field_25833 CODEC Lcom/mojang/serialization/Codec; FIELD field_26756 LIST_CODEC Lcom/mojang/serialization/Codec;