From b3d30237951ce83df670f0ca539d6d8f4de11170 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 3 Dec 2019 13:35:46 +0000 Subject: [PATCH] 1.15-pre4 --- build.gradle | 2 +- .../blaze3d/platform/GlStateManager.mapping | 10 ---------- .../mojang/blaze3d/systems/RenderSystem.mapping | 2 -- .../minecraft/client/gui/hud/DebugHud.mapping | 9 +++------ .../network/packet/ParticleS2CPacket.mapping | 16 ++++------------ .../client/render/DiffuseLighting.mapping | 2 -- .../client/render/VertexConsumerProvider.mapping | 3 --- .../client/render/VertexFormatElement.mapping | 4 ---- .../client/render/WorldRenderer.mapping | 2 +- .../entity/BannerBlockEntityRenderer.mapping | 4 ---- .../entity/EnderDragonEntityRenderer.mapping | 2 -- .../render/entity/LivingEntityRenderer.mapping | 2 -- .../entity/feature/CapeFeatureRenderer.mapping | 2 -- .../feature/StuckObjectsFeatureRenderer.mapping | 3 --- .../render/entity/model/BipedEntityModel.mapping | 2 -- .../minecraft/entity/passive/PandaEntity.mapping | 4 ---- .../net/minecraft/util/math/Quaternion.mapping | 3 --- 17 files changed, 9 insertions(+), 63 deletions(-) diff --git a/build.gradle b/build.gradle index dcc71b245e..7321757983 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { id 'maven-publish' } -def minecraft_version = "1.15-pre3" +def minecraft_version = "1.15-pre4" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping index abe86c4dde..b2dac7ca33 100644 --- a/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping +++ b/mappings/com/mojang/blaze3d/platform/GlStateManager.mapping @@ -447,8 +447,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager ARG 3 d METHOD method_22616 setupLevelDiffuseLighting (Lnet/minecraft/class_1159;)V ARG 0 modelMatrix - METHOD method_22617 setupGuiDiffuseLighting (Lnet/minecraft/class_1159;)V - ARG 0 modelMatrix METHOD method_22618 teardownOverlayColor ()V METHOD method_22883 blendColor (FFFF)V ARG 0 red @@ -526,8 +524,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager FIELD field_5076 mask Z CLASS class_1028 FogMode FIELD field_5093 value I - METHOD (I)V - ARG 1 value CLASS class_1029 FogState FIELD field_5098 end F FIELD field_5099 start F @@ -536,8 +532,6 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager FIELD field_5102 mode I CLASS class_1030 LogicOp FIELD field_5108 value I - METHOD (I)V - ARG 1 value CLASS class_1031 PolygonOffsetState FIELD field_5121 capLine Lnet/minecraft/class_4493$class_1018; FIELD field_5122 units F @@ -575,8 +569,4 @@ CLASS net/minecraft/class_4493 com/mojang/blaze3d/platform/GlStateManager FIELD field_5171 y I FIELD field_5172 x I CLASS class_4534 DstFactor - METHOD (I)V - ARG 1 value CLASS class_4535 SrcFactor - METHOD (I)V - ARG 1 value diff --git a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping index 612a278370..904ddf4833 100644 --- a/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping +++ b/mappings/com/mojang/blaze3d/systems/RenderSystem.mapping @@ -218,8 +218,6 @@ CLASS com/mojang/blaze3d/systems/RenderSystem ARG 1 y ARG 2 width ARG 3 height - METHOD setupGuiDiffuseLighting (Lnet/minecraft/class_1159;)V - ARG 0 modelMatrix METHOD setupLevelDiffuseLighting (Lnet/minecraft/class_1159;)V ARG 0 modelMatrix METHOD setupOverlayColor (Ljava/util/function/IntSupplier;I)V diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 33fb7479b3..d108bd9285 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -9,10 +9,7 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_2085 pos Lnet/minecraft/class_1923; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_15870 drawMetricsData (Lnet/minecraft/class_3517;IIZ)V - ARG 2 startY - ARG 3 firstSample - ARG 4 isClient + METHOD method_15870 drawMetricsData (Lnet/minecraft/class_1159;Lnet/minecraft/class_4597$class_4598;Lnet/minecraft/class_3517;IIZ)V METHOD method_1833 getMetricsLineColor (IIII)I ARG 1 value ARG 2 greenValue @@ -33,6 +30,6 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud METHOD method_1845 propertyToString (Ljava/util/Map$Entry;)Ljava/lang/String; ARG 1 propEntry METHOD method_1846 render ()V - METHOD method_1847 renderLeftText ()V - METHOD method_1848 renderRightText ()V + METHOD method_1847 renderLeftText (Lnet/minecraft/class_1159;Lnet/minecraft/class_4597$class_4598;)V + METHOD method_1848 renderRightText (Lnet/minecraft/class_1159;Lnet/minecraft/class_4597$class_4598;)V METHOD method_20603 getServerWorldDebugString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/network/packet/ParticleS2CPacket.mapping b/mappings/net/minecraft/client/network/packet/ParticleS2CPacket.mapping index 9c62e7e898..e678c92b25 100644 --- a/mappings/net/minecraft/client/network/packet/ParticleS2CPacket.mapping +++ b/mappings/net/minecraft/client/network/packet/ParticleS2CPacket.mapping @@ -4,22 +4,14 @@ CLASS net/minecraft/class_2675 net/minecraft/client/network/packet/ParticleS2CPa FIELD field_12253 count I FIELD field_12254 longDistance Z FIELD field_12255 offsetX F - FIELD field_12256 z F - FIELD field_12257 y F - FIELD field_12258 x F + FIELD field_12256 z D + FIELD field_12257 y D + FIELD field_12258 x D FIELD field_12259 parameters Lnet/minecraft/class_2394; FIELD field_12260 speed F - METHOD (Lnet/minecraft/class_2394;ZFFFFFFFI)V + METHOD (Lnet/minecraft/class_2394;ZDDDFFFFI)V ARG 1 parameters ARG 2 longDistance - ARG 3 x - ARG 4 y - ARG 5 z - ARG 6 offsetX - ARG 7 offsetY - ARG 8 offsetZ - ARG 9 speed - ARG 10 count METHOD method_11542 readParticleParameters (Lnet/minecraft/class_2540;Lnet/minecraft/class_2396;)Lnet/minecraft/class_2394; ARG 1 buf ARG 2 type diff --git a/mappings/net/minecraft/client/render/DiffuseLighting.mapping b/mappings/net/minecraft/client/render/DiffuseLighting.mapping index 9a29d20560..15fdd282b2 100644 --- a/mappings/net/minecraft/client/render/DiffuseLighting.mapping +++ b/mappings/net/minecraft/client/render/DiffuseLighting.mapping @@ -2,6 +2,4 @@ CLASS net/minecraft/class_308 net/minecraft/client/render/DiffuseLighting METHOD method_1450 disable ()V METHOD method_1452 enableForLevel (Lnet/minecraft/class_1159;)V ARG 0 modelMatrix - METHOD method_1453 enableForGui (Lnet/minecraft/class_1159;)V - ARG 0 modelMatrix METHOD method_22890 enable ()V diff --git a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping index c140110ec3..a903170ae9 100644 --- a/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping +++ b/mappings/net/minecraft/client/render/VertexConsumerProvider.mapping @@ -3,17 +3,14 @@ CLASS net/minecraft/class_4597 net/minecraft/client/render/VertexConsumerProvide ARG 1 layer METHOD method_22991 immediate (Lnet/minecraft/class_287;)Lnet/minecraft/class_4597$class_4598; ARG 0 builder - ARG 1 buffer METHOD method_22992 immediate (Ljava/util/Map;Lnet/minecraft/class_287;)Lnet/minecraft/class_4597$class_4598; ARG 1 layerBuffers - ARG 2 fallbackBuffer CLASS class_4598 Immediate FIELD field_20952 fallbackBuffer Lnet/minecraft/class_287; FIELD field_20953 layerBuffers Ljava/util/Map; FIELD field_20954 currentLayer Ljava/util/Optional; FIELD field_20955 activeConsumers Ljava/util/Set; METHOD (Lnet/minecraft/class_287;Ljava/util/Map;)V - ARG 0 fallbackBuffer ARG 1 layerBuffers METHOD method_22993 draw ()V METHOD method_22994 draw (Lnet/minecraft/class_1921;)V diff --git a/mappings/net/minecraft/client/render/VertexFormatElement.mapping b/mappings/net/minecraft/client/render/VertexFormatElement.mapping index ae7540f3a9..6b1c544341 100644 --- a/mappings/net/minecraft/client/render/VertexFormatElement.mapping +++ b/mappings/net/minecraft/client/render/VertexFormatElement.mapping @@ -41,10 +41,6 @@ CLASS net/minecraft/class_296 net/minecraft/client/render/VertexFormatElement FIELD field_20784 finisher Ljava/util/function/IntConsumer; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_296$class_298$class_4575;Ljava/util/function/IntConsumer;)V ARG 3 name - METHOD (Ljava/lang/String;Lnet/minecraft/class_296$class_298$class_4575;Ljava/util/function/IntConsumer;)V - ARG 1 name - ARG 2 starter - ARG 3 finisher METHOD method_1392 getName ()Ljava/lang/String; METHOD method_22654 endDrawing (I)V ARG 1 elementIndex diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index 93e40b0ac0..74aa607973 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -28,7 +28,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer FIELD field_4083 lastTranslucentSortX D FIELD field_4084 cameraChunkX I FIELD field_4085 world Lnet/minecraft/class_638; - FIELD field_4086 visibleChunks Ljava/util/List; + FIELD field_4086 visibleChunks Lit/unimi/dsi/fastutil/objects/ObjectList; FIELD field_4087 lightSkyBuffer Lnet/minecraft/class_291; FIELD field_4088 client Lnet/minecraft/class_310; FIELD field_4089 regularEntityCount I diff --git a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping index 77d3449919..14f0e77332 100644 --- a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping @@ -5,7 +5,3 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo METHOD (Lnet/minecraft/class_824;)V ARG 1 dispatcher METHOD method_24080 createField ()Lnet/minecraft/class_630; - METHOD render (Lnet/minecraft/class_2573;FLnet/minecraft/class_4587;Lnet/minecraft/class_4597;II)V - ARG 3 matrices - ARG 5 light - ARG 6 overlay diff --git a/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping index 66eb0f9ac4..4da4c737c8 100644 --- a/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/EnderDragonEntityRenderer.mapping @@ -18,5 +18,3 @@ CLASS net/minecraft/class_895 net/minecraft/client/render/entity/EnderDragonEnti FIELD field_3634 frontLegTip Lnet/minecraft/class_630; FIELD field_3635 wingTip Lnet/minecraft/class_630; FIELD field_3637 neck Lnet/minecraft/class_630; - METHOD animateModel (Lnet/minecraft/class_1510;FFF)V - ARG 3 limbDistance diff --git a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping index 6cf88cecde..1a7070a205 100644 --- a/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/LivingEntityRenderer.mapping @@ -21,5 +21,3 @@ CLASS net/minecraft/class_922 net/minecraft/client/render/entity/LivingEntityRen METHOD method_4046 addFeature (Lnet/minecraft/class_3887;)Z METHOD method_4058 setupTransforms (Lnet/minecraft/class_1309;Lnet/minecraft/class_4587;FFF)V ARG 1 entity - METHOD render (Lnet/minecraft/class_1309;FFLnet/minecraft/class_4587;Lnet/minecraft/class_4597;I)V - ARG 4 matrices diff --git a/mappings/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.mapping index 8c8241fc78..1baf1c73e2 100644 --- a/mappings/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/CapeFeatureRenderer.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_972 net/minecraft/client/render/entity/feature/CapeFeatureRenderer METHOD (Lnet/minecraft/class_3883;)V ARG 1 context - METHOD render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_742;FFFFFF)V - ARG 1 matrices diff --git a/mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping index 46acc855e6..e97ce5d4ba 100644 --- a/mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/StuckObjectsFeatureRenderer.mapping @@ -7,6 +7,3 @@ CLASS net/minecraft/class_4507 net/minecraft/client/render/entity/feature/StuckO ARG 5 tickDelta METHOD method_22134 getObjectCount (Lnet/minecraft/class_1309;)I ARG 1 entity - METHOD render (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;ILnet/minecraft/class_1309;FFFFFF)V - ARG 1 matrices - ARG 2 vertexConsumers diff --git a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping index f3f0bd4233..fb253b93c5 100644 --- a/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/BipedEntityModel.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_572 net/minecraft/client/render/entity/model/BipedEnti FIELD field_3401 rightArm Lnet/minecraft/class_630; METHOD (F)V ARG 1 scale - METHOD animateModel (Lnet/minecraft/class_1309;FFF)V - ARG 3 limbSpeed METHOD method_2804 lerpAngle (FFF)F ARG 1 from ARG 2 to diff --git a/mappings/net/minecraft/entity/passive/PandaEntity.mapping b/mappings/net/minecraft/entity/passive/PandaEntity.mapping index 07219fec51..5c067a9386 100644 --- a/mappings/net/minecraft/entity/passive/PandaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PandaEntity.mapping @@ -86,12 +86,8 @@ CLASS net/minecraft/class_1440 net/minecraft/entity/passive/PandaEntity ARG 4 slowSpeed ARG 6 fastSpeed CLASS class_1442 PandaMateGoal - FIELD field_18115 CLOSE_PLAYER_PREDICATE Lnet/minecraft/class_4051; FIELD field_6783 nextAskPlayerForBambooAge I FIELD field_6784 panda Lnet/minecraft/class_1440; - METHOD (Lnet/minecraft/class_1440;D)V - ARG 1 panda - ARG 2 chance METHOD method_6561 isBambooClose ()Z CLASS class_1443 Gene FIELD field_6785 id I diff --git a/mappings/net/minecraft/util/math/Quaternion.mapping b/mappings/net/minecraft/util/math/Quaternion.mapping index 2090e966c3..9f7d02a813 100644 --- a/mappings/net/minecraft/util/math/Quaternion.mapping +++ b/mappings/net/minecraft/util/math/Quaternion.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_1158 net/minecraft/util/math/Quaternion FIELD field_21493 IDENTITY Lnet/minecraft/class_1158; - FIELD field_21582 b F - FIELD field_21583 c F - FIELD field_21584 d F FIELD field_21585 a F METHOD (FFFF)V ARG 1 b