From c13a13d765d0798376f77d8aff41d72cf70a1199 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Tue, 1 Jun 2021 17:22:33 +0100 Subject: [PATCH] 1.17-pre3 --- build.gradle | 2 +- mappings/net/minecraft/block/AbstractLichenBlock.mapping | 5 ----- mappings/net/minecraft/block/Blocks.mapping | 6 ------ mappings/net/minecraft/client/render/WorldRenderer.mapping | 2 +- .../data/client/model/BlockStateModelGenerator.mapping | 4 ---- mappings/net/minecraft/data/client/model/Texture.mapping | 2 +- .../net/minecraft/entity/ai/control/LookControl.mapping | 4 ++-- .../net/minecraft/entity/mob/WaterCreatureEntity.mapping | 3 +-- 8 files changed, 6 insertions(+), 22 deletions(-) diff --git a/build.gradle b/build.gradle index 95fe3cbc65..d4aa9bff7f 100644 --- a/build.gradle +++ b/build.gradle @@ -26,7 +26,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "1.17-pre2" +def minecraft_version = "1.17-pre3" def ENV = System.getenv() // Fetch build number from Github Actions diff --git a/mappings/net/minecraft/block/AbstractLichenBlock.mapping b/mappings/net/minecraft/block/AbstractLichenBlock.mapping index 3cc5cc83b5..eff67bbf49 100644 --- a/mappings/net/minecraft/block/AbstractLichenBlock.mapping +++ b/mappings/net/minecraft/block/AbstractLichenBlock.mapping @@ -96,8 +96,3 @@ CLASS net/minecraft/class_5778 net/minecraft/block/AbstractLichenBlock ARG 2 world ARG 3 pos ARG 4 from - METHOD method_36292 withNoDirections (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2680; - ARG 0 block - METHOD method_36293 withAllDirectionsSet (Lnet/minecraft/class_2680;Z)Lnet/minecraft/class_2680; - ARG 0 state - ARG 1 facing diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index 81e1141fde..1f075ec54d 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -91,8 +91,6 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 1 world ARG 2 pos ARG 3 entityType - METHOD method_26133 (Lnet/minecraft/class_2680;)I - ARG 0 state METHOD method_26134 (Lnet/minecraft/class_2680;)I ARG 0 state METHOD method_26135 (Lnet/minecraft/class_2680;)I @@ -146,10 +144,6 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 2 pos METHOD method_33357 (Lnet/minecraft/class_2680;)I ARG 0 state - METHOD method_33616 (ILnet/minecraft/class_2680;)I - ARG 1 state - METHOD method_33617 createLightLevelFromBerriesBlockState (I)Ljava/util/function/ToIntFunction; - ARG 0 berriesLevel METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248; ARG 0 id ARG 1 block diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index b24438e62f..9e9215fc7e 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -211,7 +211,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer METHOD method_3254 drawEntityOutlinesFramebuffer ()V METHOD method_3255 renderStars (Lnet/minecraft/class_287;)V ARG 1 buffer - METHOD method_3257 renderSky (Lnet/minecraft/class_4587;Lnet/minecraft/class_1159;F)V + METHOD method_3257 renderSky (Lnet/minecraft/class_4587;Lnet/minecraft/class_1159;FLjava/lang/Runnable;)V ARG 1 matrices METHOD method_3258 drawBox (Lnet/minecraft/class_287;DDDDDDFFFF)V ARG 0 buffer diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping index f0fc5f941a..eae5801f3d 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping @@ -369,7 +369,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe METHOD method_32227 registerAmethysts ()V METHOD method_32228 registerCandle (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V ARG 1 candle - ARG 2 cake METHOD method_32229 registerAmethyst (Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_32802 registerPointedDripstone ()V @@ -385,9 +384,6 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe METHOD method_33712 registerSmallDripleaf ()V METHOD method_33713 registerAzalea (Lnet/minecraft/class_2248;)V ARG 1 block - METHOD method_34605 (Lnet/minecraft/class_2248;Lnet/minecraft/class_4922;Lnet/minecraft/class_2960;Lnet/minecraft/class_2746;Ljava/util/function/Function;)V - ARG 3 property - ARG 4 variantFactory METHOD method_34608 createStoneState (Lnet/minecraft/class_2248;Lnet/minecraft/class_2960;Lnet/minecraft/class_4944;Ljava/util/function/BiConsumer;)Lnet/minecraft/class_4917; ARG 0 block ARG 1 modelId diff --git a/mappings/net/minecraft/data/client/model/Texture.mapping b/mappings/net/minecraft/data/client/model/Texture.mapping index 69a1949ea6..8a53469c30 100644 --- a/mappings/net/minecraft/data/client/model/Texture.mapping +++ b/mappings/net/minecraft/data/client/model/Texture.mapping @@ -119,7 +119,7 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/model/Texture ARG 0 block METHOD method_27168 wallSideEnd (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; ARG 0 block - METHOD method_32231 candleCake (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; + METHOD method_32231 candleCake (Lnet/minecraft/class_2248;Z)Lnet/minecraft/class_4944; ARG 0 block METHOD method_32232 cauldron (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; ARG 0 content diff --git a/mappings/net/minecraft/entity/ai/control/LookControl.mapping b/mappings/net/minecraft/entity/ai/control/LookControl.mapping index 12fe2621b8..b86d856f0b 100644 --- a/mappings/net/minecraft/entity/ai/control/LookControl.mapping +++ b/mappings/net/minecraft/entity/ai/control/LookControl.mapping @@ -16,8 +16,8 @@ CLASS net/minecraft/class_1333 net/minecraft/entity/ai/control/LookControl ARG 5 z METHOD method_20249 getLookingHeightFor (Lnet/minecraft/class_1297;)D ARG 0 entity - METHOD method_20250 getTargetPitch ()F - METHOD method_20251 getTargetYaw ()F + METHOD method_20250 getTargetPitch ()Ljava/util/Optional; + METHOD method_20251 getTargetYaw ()Ljava/util/Optional; METHOD method_20433 shouldStayHorizontal ()Z METHOD method_35111 lookAt (Lnet/minecraft/class_1297;)V ARG 1 entity diff --git a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping index d30a86b806..d7dc41e3e4 100644 --- a/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping +++ b/mappings/net/minecraft/entity/mob/WaterCreatureEntity.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_1480 net/minecraft/entity/mob/WaterCreatureEntity - METHOD method_35174 canSpawnUnderground (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z + METHOD method_35174 canSpawnUnderground (Lnet/minecraft/class_1299;Lnet/minecraft/class_5425;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Ljava/util/Random;)Z ARG 0 entityType - ARG 1 world ARG 2 spawnReason ARG 3 pos ARG 4 random