diff --git a/build.gradle b/build.gradle index 0f94f03301..2f7f1014dd 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "1.15-pre2" +def minecraft_version = "1.15-pre3" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping index d15a4284c0..5187667de6 100644 --- a/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/HopperBlockEntity.mapping @@ -49,7 +49,6 @@ CLASS net/minecraft/class_2614 net/minecraft/block/entity/HopperBlockEntity ARG 1 facing METHOD method_11258 isInventoryFull (Lnet/minecraft/class_1263;Lnet/minecraft/class_2350;)Z ARG 1 inv - METHOD method_11259 isEmpty ()Z METHOD method_11260 transfer (Lnet/minecraft/class_1263;Lnet/minecraft/class_1263;Lnet/minecraft/class_1799;Lnet/minecraft/class_2350;)Lnet/minecraft/class_1799; ARG 0 from ARG 1 to diff --git a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping index d3b3bba292..c6597611cc 100644 --- a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping @@ -9,7 +9,6 @@ CLASS net/minecraft/class_4597 net/minecraft/client/render/VertexConsumerProvide ARG 2 layerBuilders METHOD method_22993 draw ()V METHOD method_22994 draw (Lnet/minecraft/class_1921;)V - ARG 1 layer METHOD method_22995 getConsumer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_287; ARG 1 layer METHOD getBuffer (Lnet/minecraft/class_1921;)Lnet/minecraft/class_4588; diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index afa2293653..d0db7651d1 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -16,18 +16,11 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder CLASS class_4577 Task FIELD field_20835 distance D FIELD field_20836 cancelled Ljava/util/concurrent/atomic/AtomicBoolean; - METHOD (D)V - ARG 1 distance - METHOD compareTo (Lnet/minecraft/class_846$class_851$class_4577;)I - ARG 1 task METHOD method_22782 cancel ()V METHOD method_22783 run (Lnet/minecraft/class_750;)Ljava/util/concurrent/CompletableFuture; ARG 1 buffers CLASS class_4578 RebuildTask FIELD field_20838 region Lnet/minecraft/class_853; - METHOD (DLnet/minecraft/class_853;)V - ARG 1 distance - ARG 3 region METHOD method_22785 render (FFFLnet/minecraft/class_846$class_849;Lnet/minecraft/class_750;)Ljava/util/Set; ARG 1 cameraX ARG 2 cameraY @@ -40,9 +33,6 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 3 blockEntity CLASS class_4579 SortTask FIELD field_20841 data Lnet/minecraft/class_846$class_849; - METHOD (DLnet/minecraft/class_846$class_849;)V - ARG 1 distance - ARG 3 data FIELD field_20834 rebuildTask Lnet/minecraft/class_846$class_851$class_4578; FIELD field_4457 blockEntities Ljava/util/Set; FIELD field_4458 boundingBox Lnet/minecraft/class_238; diff --git a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping index 8cceb62de8..884b882b91 100644 --- a/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping +++ b/mappings/net/minecraft/client/render/debug/BeeDebugRenderer.mapping @@ -101,6 +101,3 @@ CLASS net/minecraft/class_4703 net/minecraft/client/render/debug/BeeDebugRendere ARG 1 arg ARG 2 pos METHOD method_24084 getBlacklistingBees ()Ljava/util/Map; - METHOD render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;DDD)V - ARG 1 matrices - ARG 2 vertexConsumer diff --git a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping index f875db516f..239aa3b2ee 100644 --- a/mappings/net/minecraft/client/render/item/ItemRenderer.mapping +++ b/mappings/net/minecraft/client/render/item/ItemRenderer.mapping @@ -30,7 +30,6 @@ CLASS net/minecraft/class_918 net/minecraft/client/render/item/ItemRenderer METHOD method_4020 getOverriddenModel (Lnet/minecraft/class_1087;Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Lnet/minecraft/class_1309;)Lnet/minecraft/class_1087; ARG 2 stack METHOD method_4021 renderGuiItemModel (Lnet/minecraft/class_1799;IILnet/minecraft/class_1087;)V - ARG 1 itemStack ARG 2 x ARG 3 y METHOD method_4022 renderGuiItemOverlay (Lnet/minecraft/class_327;Lnet/minecraft/class_1799;IILjava/lang/String;)V diff --git a/mappings/net/minecraft/client/render/model/SpriteAtlasManager.mapping b/mappings/net/minecraft/client/render/model/SpriteAtlasManager.mapping index e4c74a96d7..14b5ffbda2 100644 --- a/mappings/net/minecraft/client/render/model/SpriteAtlasManager.mapping +++ b/mappings/net/minecraft/client/render/model/SpriteAtlasManager.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_4724 net/minecraft/client/render/model/SpriteAtlasManager FIELD field_21746 atlases Ljava/util/Map; - METHOD method_24095 (ILnet/minecraft/class_1060;Lnet/minecraft/class_1059;)V - ARG 2 atlas METHOD method_24097 getSprite (Lnet/minecraft/class_4730;)Lnet/minecraft/class_1058; ARG 1 id METHOD method_24098 getAtlas (Lnet/minecraft/class_2960;)Lnet/minecraft/class_1059; diff --git a/mappings/net/minecraft/item/ArmorItem.mapping b/mappings/net/minecraft/item/ArmorItem.mapping index bd379ebe4e..f3ced8173a 100644 --- a/mappings/net/minecraft/item/ArmorItem.mapping +++ b/mappings/net/minecraft/item/ArmorItem.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_1738 net/minecraft/item/ArmorItem ARG 1 material ARG 2 slot ARG 3 settings - METHOD method_7684 dispenseArmor (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + METHOD method_7684 dispenseArmor (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;)Z ARG 0 pointer ARG 1 armor METHOD method_7685 getSlotType ()Lnet/minecraft/class_1304; diff --git a/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping b/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping index dfbd85a4ce..0c25573de4 100644 --- a/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping +++ b/mappings/net/minecraft/world/chunk/light/LevelPropagator.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_3554 net/minecraft/world/chunk/light/LevelPropagator FIELD field_15781 minPendingLevel I FIELD field_15782 hasPendingUpdates Z FIELD field_15783 levelCount I - FIELD field_15784 pendingUpdates Lit/unimi/dsi/fastutil/longs/Long2ByteFunction; + FIELD field_15784 pendingUpdates Lit/unimi/dsi/fastutil/longs/Long2ByteMap; FIELD field_15785 pendingIdUpdatesByLevel [Lit/unimi/dsi/fastutil/longs/LongLinkedOpenHashSet; METHOD (III)V ARG 1 levelCount