Region and session lock (#1254)

* Region and session lock

Signed-off-by: liach <liach@users.noreply.github.com>

* Update mappings/net/minecraft/world/gen/StructureAccessor.mapping

Co-Authored-By: Yanis48 <doublecraft.official@gmail.com>

Co-authored-by: liach <liach@users.noreply.github.com>
Co-authored-by: Yanis48 <doublecraft.official@gmail.com>
This commit is contained in:
liach 2020-04-04 15:19:01 -05:00 committed by GitHub
parent cabb00e658
commit 032ee0894b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 88 additions and 0 deletions

View File

@ -107,6 +107,7 @@ CLASS net/minecraft/server/MinecraftServer
METHOD method_24489 stopDebug ()Lnet/minecraft/class_3696;
METHOD method_24490 endMonitor (Lnet/minecraft/class_4758;)V
ARG 1 monitor
METHOD method_27051 syncChunkWrites ()Z
METHOD method_3716 getKeyPair ()Ljava/security/KeyPair;
METHOD method_3717 start ()V
METHOD method_3718 isFlightEnabled ()Z

View File

@ -45,5 +45,6 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa
FIELD field_16844 viewDistance I
FIELD field_16845 opPermissionLevel I
FIELD field_20324 functionPermissionLevel I
FIELD field_23785 syncChunkWrites Z
METHOD method_16714 load (Ljava/nio/file/Path;)Lnet/minecraft/class_3806;
ARG 0 path

View File

@ -19,6 +19,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
FIELD field_18263 wanderingTraderManager Lnet/minecraft/class_3990;
FIELD field_18264 ticking Z
FIELD field_18811 raidManager Lnet/minecraft/class_3767;
FIELD field_23787 structureAccessor Lnet/minecraft/class_5138;
METHOD <init> (Lnet/minecraft/server/MinecraftServer;Ljava/util/concurrent/Executor;Lnet/minecraft/class_29;Lnet/minecraft/class_31;Lnet/minecraft/class_2874;Lnet/minecraft/class_3949;)V
ARG 1 server
ARG 2 workerExecutor
@ -152,6 +153,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld
ARG 1 box
METHOD method_23660 wakeSleepingPlayers ()V
METHOD method_24500 locateBiome (Lnet/minecraft/class_1959;Lnet/minecraft/class_2338;II)Lnet/minecraft/class_2338;
METHOD method_27056 getStructureAccessor ()Lnet/minecraft/class_5138;
METHOD method_8414 init (Lnet/minecraft/class_1940;)V
ARG 1 levelInfo
METHOD method_8416 addLightning (Lnet/minecraft/class_1538;)V

View File

@ -0,0 +1,5 @@
CLASS net/minecraft/class_5127 net/minecraft/util/ThrowableDeliverer
FIELD field_23694 throwable Ljava/lang/Throwable;
METHOD method_26806 deliver ()V
METHOD method_26807 add (Ljava/lang/Throwable;)V
ARG 1 throwable

View File

@ -0,0 +1,19 @@
CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor
METHOD method_26973 addStructureReference (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;JLnet/minecraft/class_2810;)V
ARG 1 pos
ARG 2 feature
ARG 3 reference
ARG 5 holder
METHOD method_26974 getStructuresWithChildren (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_1936;)Ljava/util/stream/Stream;
ARG 1 pos
ARG 2 feature
ARG 3 world
METHOD method_26975 getStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_2810;)Lnet/minecraft/class_3449;
ARG 1 pos
ARG 2 feature
ARG 3 holder
METHOD method_26976 setStructureStart (Lnet/minecraft/class_4076;Lnet/minecraft/class_3195;Lnet/minecraft/class_3449;Lnet/minecraft/class_2810;)V
ARG 1 pos
ARG 2 feature
ARG 3 structureStart
ARG 4 holder

View File

@ -18,3 +18,29 @@ CLASS net/minecraft/class_32 net/minecraft/world/level/storage/LevelStorage
METHOD method_235 getLevelList ()Ljava/util/List;
METHOD method_236 getBackupsDirectory ()Ljava/nio/file/Path;
METHOD method_240 isLevelNameValid (Ljava/lang/String;)Z
ARG 1 name
METHOD method_26998 readLevelProperties (Ljava/io/File;)Lnet/minecraft/class_31;
METHOD method_26999 create (Ljava/nio/file/Path;)Lnet/minecraft/class_32;
ARG 0 path
METHOD method_27002 createSession (Ljava/lang/String;)Lnet/minecraft/class_32$class_5143;
ARG 1 directoryName
CLASS class_5143 Session
FIELD field_23767 lock Lnet/minecraft/class_5125;
FIELD field_23768 directory Ljava/nio/file/Path;
FIELD field_23769 directoryName Ljava/lang/String;
METHOD <init> (Lnet/minecraft/class_32;Ljava/lang/String;)V
ARG 2 directoryName
METHOD method_27005 getDirectoryName ()Ljava/lang/String;
METHOD method_27006 convert (Lnet/minecraft/class_3536;)Z
ARG 1 progressListener
METHOD method_27008 save (Ljava/lang/String;)V
ARG 1 name
METHOD method_27009 createSaveHandler (Lnet/minecraft/server/MinecraftServer;)Lnet/minecraft/class_29;
ARG 1 server
METHOD method_27010 getDirectory ()Ljava/nio/file/Path;
METHOD method_27012 needsConversion ()Z
METHOD method_27013 readLevelProperties ()Lnet/minecraft/class_31;
METHOD method_27014 getIconFile ()Ljava/io/File;
METHOD method_27015 deleteSessionLock ()V
METHOD method_27016 createBackup ()J
METHOD method_27017 checkValid ()V

View File

@ -0,0 +1,17 @@
CLASS net/minecraft/class_5125 net/minecraft/world/level/storage/SessionLock
FIELD field_23692 channel Ljava/nio/channels/FileChannel;
FIELD field_23693 lock Ljava/nio/channels/FileLock;
METHOD <init> (Ljava/nio/channels/FileChannel;Ljava/nio/channels/FileLock;)V
ARG 1 channel
ARG 2 lock
METHOD method_26802 isValid ()Z
METHOD method_26803 create (Ljava/nio/file/Path;)Lnet/minecraft/class_5125;
ARG 0 path
METHOD method_26804 isLocked (Ljava/nio/file/Path;)Z
ARG 0 path
CLASS class_5126 AlreadyLockedException
METHOD <init> (Ljava/nio/file/Path;Ljava/lang/String;)V
ARG 1 path
ARG 2 message
METHOD method_26805 create (Ljava/nio/file/Path;)Lnet/minecraft/class_5125$class_5126;
ARG 0 path

View File

@ -15,6 +15,7 @@ CLASS net/minecraft/class_2861 net/minecraft/world/storage/RegionFile
METHOD <init> (Ljava/nio/file/Path;Ljava/nio/file/Path;Lnet/minecraft/class_4486;Z)V
ARG 1 file
ARG 2 directory
ARG 3 outputChunkStreamVersion
ARG 4 dsync
METHOD method_12419 getSectorData (Lnet/minecraft/class_1923;)I
ARG 1 pos

View File

@ -7,8 +7,14 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
FIELD field_19228 dataFixer Lcom/mojang/datafixers/DataFixer;
FIELD field_19229 dataFixType Lnet/minecraft/class_4284;
FIELD field_21505 worker Lnet/minecraft/class_4698;
FIELD field_23749 serializer Lnet/minecraft/class_5128;
METHOD <init> (Ljava/io/File;Lnet/minecraft/class_5128;Ljava/util/function/BiFunction;Ljava/util/function/Function;Lcom/mojang/datafixers/DataFixer;Lnet/minecraft/class_4284;Z)V
ARG 1 directory
ARG 2 serializer
ARG 3 deserializer
ARG 4 factory
ARG 5 dataFixer
ARG 6 dataFixType
METHOD method_19288 onUpdate (J)V
ARG 1 pos
METHOD method_19289 loadDataAt (Lnet/minecraft/class_1923;)V
@ -24,5 +30,11 @@ CLASS net/minecraft/class_4180 net/minecraft/world/storage/SerializingRegionBase
ARG 1 pos
METHOD method_19295 getOrCreate (J)Ljava/lang/Object;
ARG 1 pos
METHOD method_20368 update (Lnet/minecraft/class_1923;Lcom/mojang/datafixers/types/DynamicOps;Ljava/lang/Object;)V
ARG 1 pos
ARG 2 ops
ARG 3 data
METHOD method_20369 getDataVersion (Lcom/mojang/datafixers/Dynamic;)I
METHOD method_20370 save (Lnet/minecraft/class_1923;)V
METHOD method_20621 loadNbt (Lnet/minecraft/class_1923;)Lnet/minecraft/class_2487;
ARG 1 pos

View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_5128 net/minecraft/world/storage/StorageSerializer
METHOD serialize (Ljava/lang/Object;Lcom/mojang/datafixers/types/DynamicOps;)Ljava/lang/Object;
ARG 1 object
ARG 2 ops