From 08dc88d859ad77cec357ad557cdc7498bcb34349 Mon Sep 17 00:00:00 2001 From: liach <7806504+liach@users.noreply.github.com> Date: Wed, 10 Jul 2019 14:52:57 +0800 Subject: [PATCH] Mapped some non-realms stuff (#782) --- .../realmsclient/dto/WorldTemplate.mapping | 2 ++ .../client/options/FullScreenOption.mapping | 1 + .../net/minecraft/client/util/Window.mapping | 2 ++ .../entity/ai/brain/task/PickUpItemTask.mapping | 2 ++ .../ai/brain/task/VillagerWorkTask.mapping | 1 + .../entity/passive/VillagerEntity.mapping | 11 +++++++++-- .../minecraft/server/world/ServerWorld.mapping | 2 ++ .../world/ThreadedAnvilChunkStorage.mapping | 1 + mappings/net/minecraft/util/CsvWriter.mapping | 17 +++++++++++++++++ 9 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 mappings/com/mojang/realmsclient/dto/WorldTemplate.mapping create mode 100644 mappings/net/minecraft/client/options/FullScreenOption.mapping create mode 100644 mappings/net/minecraft/entity/ai/brain/task/PickUpItemTask.mapping create mode 100644 mappings/net/minecraft/util/CsvWriter.mapping diff --git a/mappings/com/mojang/realmsclient/dto/WorldTemplate.mapping b/mappings/com/mojang/realmsclient/dto/WorldTemplate.mapping new file mode 100644 index 0000000000..c1ad618f05 --- /dev/null +++ b/mappings/com/mojang/realmsclient/dto/WorldTemplate.mapping @@ -0,0 +1,2 @@ +CLASS com/mojang/realmsclient/dto/WorldTemplate + CLASS class_4323 Type diff --git a/mappings/net/minecraft/client/options/FullScreenOption.mapping b/mappings/net/minecraft/client/options/FullScreenOption.mapping new file mode 100644 index 0000000000..95ab2d456c --- /dev/null +++ b/mappings/net/minecraft/client/options/FullScreenOption.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_4454 net/minecraft/client/options/FullScreenOption diff --git a/mappings/net/minecraft/client/util/Window.mapping b/mappings/net/minecraft/client/util/Window.mapping index e221751a48..9d93cfc1bf 100644 --- a/mappings/net/minecraft/client/util/Window.mapping +++ b/mappings/net/minecraft/client/util/Window.mapping @@ -24,6 +24,7 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window METHOD method_15999 setFramerateLimit (I)V METHOD method_16000 getFramerateLimit ()I METHOD method_16001 pollEvents ()V + METHOD method_20831 getMonitor ()Lnet/minecraft/class_313; METHOD method_4474 setPhase (Ljava/lang/String;)V ARG 1 phase METHOD method_4476 calculateScaleFactor (IZ)I @@ -60,6 +61,7 @@ CLASS net/minecraft/class_1041 net/minecraft/client/util/Window ARG 1 window ARG 3 width ARG 4 height + METHOD method_4505 setVideoMode (Ljava/util/Optional;)V METHOD method_4506 getFramebufferHeight ()I METHOD method_4507 getHeight ()I METHOD method_4511 getVideoMode ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/entity/ai/brain/task/PickUpItemTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/PickUpItemTask.mapping new file mode 100644 index 0000000000..167fbf99aa --- /dev/null +++ b/mappings/net/minecraft/entity/ai/brain/task/PickUpItemTask.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_4318 net/minecraft/entity/ai/brain/task/PickUpItemTask + FIELD field_19425 nearbyItems Ljava/util/List; diff --git a/mappings/net/minecraft/entity/ai/brain/task/VillagerWorkTask.mapping b/mappings/net/minecraft/entity/ai/brain/task/VillagerWorkTask.mapping index 6ca1381f8d..28ee884808 100644 --- a/mappings/net/minecraft/entity/ai/brain/task/VillagerWorkTask.mapping +++ b/mappings/net/minecraft/entity/ai/brain/task/VillagerWorkTask.mapping @@ -1 +1,2 @@ CLASS net/minecraft/class_4133 net/minecraft/entity/ai/brain/task/VillagerWorkTask + FIELD field_19426 lastCheckedTime J diff --git a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping index 08b1204216..27c29cb707 100644 --- a/mappings/net/minecraft/entity/passive/VillagerEntity.mapping +++ b/mappings/net/minecraft/entity/passive/VillagerEntity.mapping @@ -8,11 +8,12 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity FIELD field_18534 gossip Lnet/minecraft/class_4136; FIELD field_18535 gossipStartTime J FIELD field_18536 experience I - FIELD field_18537 lastRestock J + FIELD field_18537 lastRestockTime J FIELD field_18538 MEMORY_MODULES Lcom/google/common/collect/ImmutableList; FIELD field_18539 SENSORS Lcom/google/common/collect/ImmutableList; FIELD field_18851 POINTS_OF_INTEREST Ljava/util/Map; - FIELD field_19357 lastGossipDecay J + FIELD field_19357 lastGossipDecayTime J + FIELD field_19427 restocksToday I FIELD field_7445 VILLAGER_DATA Lnet/minecraft/class_2940; METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;Lnet/minecraft/class_3854;)V ARG 1 entityType @@ -65,6 +66,12 @@ CLASS net/minecraft/class_1646 net/minecraft/entity/passive/VillagerEntity METHOD method_20698 lacksFood ()Z METHOD method_20741 hasRecentlyWorkedAndSlept (J)Z ARG 1 worldTime + METHOD method_20820 canGather (Lnet/minecraft/class_1792;)Z + ARG 1 item + METHOD method_20821 clearDailyRestockCount ()V + METHOD method_20822 shouldRestock ()Z + METHOD method_20823 needRestock ()Z + METHOD method_20824 canRestock ()Z METHOD method_7221 setVillagerData (Lnet/minecraft/class_3850;)V ARG 1 villagerData METHOD method_7234 wantsToStartBreeding ()Z diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 370bb3c1cb..0f643622b9 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -131,6 +131,8 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_19503 hasRaidAt (Lnet/minecraft/class_2338;)Z ARG 1 pos METHOD method_20588 isNearOccupiedPointOfInterest (Lnet/minecraft/class_4076;)Z + METHOD method_21624 exportEntities (Ljava/io/Writer;)V + METHOD method_21626 exportBlockEntities (Ljava/io/Writer;)V METHOD method_8414 init (Lnet/minecraft/class_1940;)V ARG 1 levelInfo METHOD method_8416 addLightning (Lnet/minecraft/class_1538;)V diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 9179ba4858..932a2031f6 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -132,3 +132,4 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor METHOD method_18727 tickPlayerMovement ()V METHOD method_19488 getPointOfInterestStorage ()Lnet/minecraft/class_4153; METHOD method_20580 createBorderFuture (Lnet/minecraft/class_3193;)Ljava/util/concurrent/CompletableFuture; + METHOD method_21619 exportChunks (Ljava/io/Writer;)V diff --git a/mappings/net/minecraft/util/CsvWriter.mapping b/mappings/net/minecraft/util/CsvWriter.mapping new file mode 100644 index 0000000000..ead1d3f9eb --- /dev/null +++ b/mappings/net/minecraft/util/CsvWriter.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_4456 net/minecraft/util/CsvWriter + CLASS class_4457 Header + FIELD field_20286 columns Ljava/util/List; + METHOD method_21631 startBody (Ljava/io/Writer;)Lnet/minecraft/class_4456; + METHOD method_21632 addColumn (Ljava/lang/String;)Lnet/minecraft/class_4456$class_4457; + FIELD field_20284 writer Ljava/io/Writer; + FIELD field_20285 column I + METHOD (Ljava/io/Writer;Ljava/util/List;)V + ARG 1 writer + ARG 2 headers + METHOD method_21627 makeHeader ()Lnet/minecraft/class_4456$class_4457; + METHOD method_21628 print (Ljava/lang/Object;)Ljava/lang/String; + ARG 0 object + METHOD method_21629 printRow (Ljava/util/stream/Stream;)V + ARG 1 columns + METHOD method_21630 printRow ([Ljava/lang/Object;)V + ARG 1 columns