From 64b704d91437a903de4608c96954c7cd0974bb81 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Fri, 12 Jun 2020 16:18:26 +0100 Subject: [PATCH] 1.16-pre5 --- build.gradle | 2 +- .../client/gui/hud/spectator/SpectatorMenu.mapping | 1 - .../client/gui/screen/VideoOptionsScreen.mapping | 1 - .../data/client/model/PropertiesEntry.mapping | 13 ------------- .../data/client/model/PropertiesMap.mapping | 2 -- .../net/minecraft/item/FlintAndSteelItem.mapping | 6 ------ mappings/net/minecraft/state/StateManager.mapping | 3 --- mappings/net/minecraft/text/Text.mapping | 4 ---- 8 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 mappings/net/minecraft/data/client/model/PropertiesEntry.mapping diff --git a/build.gradle b/build.gradle index f2ec1fa8b5..170871554c 100644 --- a/build.gradle +++ b/build.gradle @@ -23,7 +23,7 @@ plugins { id 'java' // for jd gen } -def minecraft_version = "1.16-pre4" +def minecraft_version = "1.16-pre5" def ENV = System.getenv() // Fetch build number from Jenkins diff --git a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping index e26a4ca164..0fb8c5c6d6 100644 --- a/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping +++ b/mappings/net/minecraft/client/gui/hud/spectator/SpectatorMenu.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_531 net/minecraft/client/gui/hud/spectator/SpectatorMe FIELD field_3254 selectedSlot I FIELD field_3255 closeCallback Lnet/minecraft/class_536; FIELD field_3256 NEXT_PAGE_COMMAND Lnet/minecraft/class_537; - FIELD field_3257 stateStack Ljava/util/List; FIELD field_3258 currentGroup Lnet/minecraft/class_535; FIELD field_3259 DISABLED_NEXT_PAGE_COMMAND Lnet/minecraft/class_537; FIELD field_3260 BLANK_COMMAND Lnet/minecraft/class_537; diff --git a/mappings/net/minecraft/client/gui/screen/VideoOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/VideoOptionsScreen.mapping index 06a544804e..d60f73fe06 100644 --- a/mappings/net/minecraft/client/gui/screen/VideoOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/VideoOptionsScreen.mapping @@ -4,6 +4,5 @@ CLASS net/minecraft/class_446 net/minecraft/client/gui/screen/VideoOptionsScreen FIELD field_2640 OPTIONS [Lnet/minecraft/class_316; METHOD (Lnet/minecraft/class_437;Lnet/minecraft/class_315;)V ARG 1 parent - ARG 2 options METHOD method_19865 (Lnet/minecraft/class_4185;)V ARG 1 button diff --git a/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping b/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping deleted file mode 100644 index a6c4070dee..0000000000 --- a/mappings/net/minecraft/data/client/model/PropertiesEntry.mapping +++ /dev/null @@ -1,13 +0,0 @@ -CLASS net/minecraft/class_4933 net/minecraft/data/client/model/PropertiesEntry - COMMENT Represents a property to value pair in block state definition. - COMMENT - COMMENT

This object is immutable. - FIELD field_22879 property Lnet/minecraft/class_2769; - FIELD field_22880 value Ljava/lang/Comparable; - METHOD (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)V - ARG 1 property - ARG 2 value - METHOD method_25815 getProperty ()Lnet/minecraft/class_2769; - METHOD method_25816 streamAllFor (Lnet/minecraft/class_2769;)Ljava/util/stream/Stream; - COMMENT Returns a stream of all possible property to value pairs for a specific - COMMENT property. diff --git a/mappings/net/minecraft/data/client/model/PropertiesMap.mapping b/mappings/net/minecraft/data/client/model/PropertiesMap.mapping index df30a36c67..5e116138cc 100644 --- a/mappings/net/minecraft/data/client/model/PropertiesMap.mapping +++ b/mappings/net/minecraft/data/client/model/PropertiesMap.mapping @@ -7,7 +7,5 @@ CLASS net/minecraft/class_4934 net/minecraft/data/client/model/PropertiesMap FIELD field_22882 COMPARATOR Ljava/util/Comparator; FIELD field_22883 propertyValues Ljava/util/List; METHOD method_25818 empty ()Lnet/minecraft/class_4934; - METHOD method_25819 with (Lnet/minecraft/class_4933;)Lnet/minecraft/class_4934; METHOD method_25820 with (Lnet/minecraft/class_4934;)Lnet/minecraft/class_4934; - METHOD method_25821 create ([Lnet/minecraft/class_4933;)Lnet/minecraft/class_4934; METHOD method_25822 asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/item/FlintAndSteelItem.mapping b/mappings/net/minecraft/item/FlintAndSteelItem.mapping index 92100fa938..936ddb58f4 100644 --- a/mappings/net/minecraft/item/FlintAndSteelItem.mapping +++ b/mappings/net/minecraft/item/FlintAndSteelItem.mapping @@ -1,11 +1,5 @@ CLASS net/minecraft/class_1786 net/minecraft/item/FlintAndSteelItem - METHOD method_17439 isIgnitable (Lnet/minecraft/class_2680;)Z - ARG 0 state METHOD method_20276 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V ARG 1 p METHOD method_20277 (Lnet/minecraft/class_1838;Lnet/minecraft/class_1657;)V ARG 1 p - METHOD method_7825 canIgnite (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Z - ARG 0 block - ARG 1 world - ARG 2 pos diff --git a/mappings/net/minecraft/state/StateManager.mapping b/mappings/net/minecraft/state/StateManager.mapping index ac1500a6f7..596b689805 100644 --- a/mappings/net/minecraft/state/StateManager.mapping +++ b/mappings/net/minecraft/state/StateManager.mapping @@ -4,8 +4,6 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager FIELD field_12316 properties Lcom/google/common/collect/ImmutableSortedMap; FIELD field_12317 owner Ljava/lang/Object; METHOD (Ljava/util/function/Function;Ljava/lang/Object;Lnet/minecraft/class_2689$class_2691;Ljava/util/Map;)V - ARG 1 ownerToStateFunction - ARG 2 owner ARG 3 factory ARG 4 propertiesMap METHOD method_11659 getProperties ()Ljava/util/Collection; @@ -30,4 +28,3 @@ CLASS net/minecraft/class_2689 net/minecraft/state/StateManager METHOD create (Ljava/lang/Object;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)Ljava/lang/Object; ARG 1 owner ARG 2 entries - CLASS class_5306 PropertiesCodec diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index cc31319a12..6224b95db3 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -9,10 +9,6 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text COMMENT refer to {@link MutableText}.

COMMENT COMMENT @see MutableText - METHOD getString ()Ljava/lang/String; - COMMENT Returns the full string representation of this text, including siblings. - COMMENT - COMMENT {@inheritDoc} METHOD method_10851 asString ()Ljava/lang/String; COMMENT Returns the string representation of this text itself, excluding siblings. METHOD method_10855 getSiblings ()Ljava/util/List;