From 92113592d9ecda34ad3631e01940e24c8b0683ee Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 25 May 2023 14:11:32 +0100 Subject: [PATCH] 1.20-pre6 --- build.gradle | 2 +- .../minecraft/entity/boss/dragon/EnderDragonFight.mapping | 8 +++----- mappings/net/minecraft/loot/LootTable.mapping | 1 - mappings/net/minecraft/recipe/Ingredient.mapping | 3 +-- mappings/net/minecraft/world/SaveProperties.mapping | 5 ++--- .../net/minecraft/world/level/LevelProperties.mapping | 5 ++--- 6 files changed, 9 insertions(+), 15 deletions(-) diff --git a/build.gradle b/build.gradle index 7bd42fcb67..13ffd2b05a 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "1.20-pre5" +def minecraft_version = "1.20-pre6" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping index e4dcf3f9af..7461ba880c 100644 --- a/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping +++ b/mappings/net/minecraft/entity/boss/dragon/EnderDragonFight.mapping @@ -24,14 +24,12 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight FIELD field_44876 showBossBarPredicate Ljava/util/function/Predicate; FIELD field_44877 origin Lnet/minecraft/class_2338; FIELD field_44878 skipChunksLoadedCheck Z - METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2487;)V + METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2881$class_8576;)V ARG 1 world ARG 2 gatewaysSeed - ARG 4 nbt - METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2487;Lnet/minecraft/class_2338;)V + METHOD (Lnet/minecraft/class_3218;JLnet/minecraft/class_2881$class_8576;Lnet/minecraft/class_2338;)V ARG 1 world ARG 2 gatewaysSeed - ARG 4 nbt ARG 5 origin METHOD method_12514 worldContainsEndPortal ()Z METHOD method_12515 convertFromLegacy ()V @@ -55,7 +53,7 @@ CLASS net/minecraft/class_2881 net/minecraft/entity/boss/dragon/EnderDragonFight ARG 1 dragon METHOD method_12529 respawnDragon (Ljava/util/List;)V ARG 1 crystals - METHOD method_12530 toNbt ()Lnet/minecraft/class_2487; + METHOD method_12530 toNbt ()Lnet/minecraft/class_2881$class_8576; METHOD method_12531 findEndPortal ()Lnet/minecraft/class_2700$class_2702; METHOD method_12532 updateFight (Lnet/minecraft/class_1510;)V ARG 1 dragon diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping index 6eb66dc52a..c44e3bf8e3 100644 --- a/mappings/net/minecraft/loot/LootTable.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable - FIELD field_44891 DEFAULT_ID Lnet/minecraft/class_2960; FIELD field_44892 randomSequenceId Lnet/minecraft/class_2960; FIELD field_942 type Lnet/minecraft/class_176; FIELD field_943 pools [Lnet/minecraft/class_55; diff --git a/mappings/net/minecraft/recipe/Ingredient.mapping b/mappings/net/minecraft/recipe/Ingredient.mapping index 48e50ea60c..bc666ca4d4 100644 --- a/mappings/net/minecraft/recipe/Ingredient.mapping +++ b/mappings/net/minecraft/recipe/Ingredient.mapping @@ -35,9 +35,8 @@ CLASS net/minecraft/class_1856 net/minecraft/recipe/Ingredient METHOD method_8105 getMatchingStacks ()[Lnet/minecraft/class_1799; METHOD method_8106 fromTag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_1856; ARG 0 tag - METHOD method_8107 entryFromJson (Lcom/google/gson/JsonObject;Z)Lnet/minecraft/class_1856$class_1859; + METHOD method_8107 entryFromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_1856$class_1859; ARG 0 json - ARG 1 allowAir METHOD test (Ljava/lang/Object;)Z ARG 1 stack CLASS class_1857 StackEntry diff --git a/mappings/net/minecraft/world/SaveProperties.mapping b/mappings/net/minecraft/world/SaveProperties.mapping index ac784bfdff..b11d06181b 100644 --- a/mappings/net/minecraft/world/SaveProperties.mapping +++ b/mappings/net/minecraft/world/SaveProperties.mapping @@ -34,9 +34,8 @@ CLASS net/minecraft/class_5219 net/minecraft/world/SaveProperties ARG 1 id METHOD method_27859 getMainWorldProperties ()Lnet/minecraft/class_5268; METHOD method_28057 getGeneratorOptions ()Lnet/minecraft/class_5285; - METHOD method_29036 getDragonFight ()Lnet/minecraft/class_2487; - METHOD method_29037 setDragonFight (Lnet/minecraft/class_2487;)V - ARG 1 dragonFight + METHOD method_29036 getDragonFight ()Lnet/minecraft/class_2881$class_8576; + METHOD method_29037 setDragonFight (Lnet/minecraft/class_2881$class_8576;)V METHOD method_29588 getLifecycle ()Lcom/mojang/serialization/Lifecycle; METHOD method_29589 getDataConfiguration ()Lnet/minecraft/class_7712; METHOD method_29590 updateLevelInfo (Lnet/minecraft/class_7712;)V diff --git a/mappings/net/minecraft/world/level/LevelProperties.mapping b/mappings/net/minecraft/world/level/LevelProperties.mapping index 8651bafd9e..c2347dc9dd 100644 --- a/mappings/net/minecraft/world/level/LevelProperties.mapping +++ b/mappings/net/minecraft/world/level/LevelProperties.mapping @@ -26,7 +26,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_24193 worldBorder Lnet/minecraft/class_2784$class_5200; FIELD field_25029 LOGGER Lorg/slf4j/Logger; FIELD field_25030 levelInfo Lnet/minecraft/class_1940; - FIELD field_25031 dragonFight Lnet/minecraft/class_2487; + FIELD field_25031 dragonFight Lnet/minecraft/class_2881$class_8576; FIELD field_25425 generatorOptions Lnet/minecraft/class_5285; FIELD field_25426 lifecycle Lcom/mojang/serialization/Lifecycle; FIELD field_26367 spawnAngle F @@ -34,7 +34,7 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties FIELD field_36349 PLAYER_KEY Ljava/lang/String; FIELD field_40372 specialProperty Lnet/minecraft/class_31$class_7729; FIELD field_43352 removedFeatures Ljava/util/Set; - METHOD (Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;ZIIIFJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V + METHOD (Lcom/mojang/datafixers/DataFixer;ILnet/minecraft/class_2487;ZIIIFJJIIIZIZZZLnet/minecraft/class_2784$class_5200;IILjava/util/UUID;Ljava/util/Set;Ljava/util/Set;Lnet/minecraft/class_236;Lnet/minecraft/class_2487;Lnet/minecraft/class_2881$class_8576;Lnet/minecraft/class_1940;Lnet/minecraft/class_5285;Lnet/minecraft/class_31$class_7729;Lcom/mojang/serialization/Lifecycle;)V ARG 1 dataFixer ARG 2 dataVersion ARG 3 playerData @@ -61,7 +61,6 @@ CLASS net/minecraft/class_31 net/minecraft/world/level/LevelProperties ARG 26 removedFeatures ARG 27 scheduledEvents ARG 28 customBossEvents - ARG 29 dragonFight ARG 30 levelInfo ARG 31 generatorOptions ARG 32 specialProperty