From 3eb7466178040ec3e337608de354734f736a8b77 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 22 Nov 2021 18:18:04 +0000 Subject: [PATCH] 1.18-pre6 --- build.gradle | 45 +------------------ .../block/EntityShapeContext.mapping | 6 +-- .../net/minecraft/block/ShapeContext.mapping | 2 - mappings/net/minecraft/entity/Entity.mapping | 11 +---- .../world/ThreadedAnvilChunkStorage.mapping | 2 - .../minecraft/util/shape/VoxelShape.mapping | 8 ++-- .../minecraft/util/shape/VoxelShapes.mapping | 18 -------- .../gen/feature/DefaultBiomeFeatures.mapping | 2 - record_signatures.json | 16 ------- 9 files changed, 8 insertions(+), 102 deletions(-) delete mode 100644 record_signatures.json diff --git a/build.gradle b/build.gradle index 4d2d4707f8..68c8f2c043 100644 --- a/build.gradle +++ b/build.gradle @@ -27,7 +27,7 @@ plugins { id 'net.fabricmc.filament' version '0.3.0' } -def minecraft_version = "1.18-pre5" +def minecraft_version = "1.18-pre6" def ENV = System.getenv() // Fetch build number from Github Actions @@ -102,7 +102,6 @@ def serverBootstrapJar = new File(cacheFilesMinecraft, "${minecraft_version}-ser def serverJar = new File(cacheFilesMinecraft, "${minecraft_version}-server.jar") def libraries = new File(cacheFilesMinecraft, "libraries") def libs = new File("build/libs/") -def recordSignaturesJson = file("record_signatures.json") import com.google.common.hash.Hashing import cuchaz.enigma.command.CheckMappingsCommand @@ -413,45 +412,11 @@ task mapIntermediaryJar(dependsOn: [downloadMcLibs, downloadIntermediary, mergeJ //Force the task to always run outputs.upToDateWhen { false } - def brokenSignatures = new HashMap((Map) new JsonSlurper().parse(recordSignaturesJson)) doLast { logger.lifecycle(":mapping minecraft to intermediary") def tinyInput = downloadIntermediary.dest - mapJar(intermediaryJar, mergedFile, tinyInput, libraries, "official", "intermediary") { remapperBuilder -> - // Fix the broken record signatures - remapperBuilder.extraPostApplyVisitor { cls, next -> - return new ClassVisitor(Opcodes.ASM9, next) { - @Override - public void visit(int version, int access, String name, String signature, String superName, String[] interfaces) { - if (signature == null) { - signature = brokenSignatures.getOrDefault(name, null); - if (signature != null) { - logger.lifecycle("replacing signature for " + name); - } - } - super.visit(version, access, name, signature, superName, interfaces); - } - } - } - - remapperBuilder.extraPostApplyVisitor { cls, next -> - if (!cls.record && cls.superName == "java/lang/Record") { - return new ClassVisitor(Opcodes.ASM9, next) { - @Override - FieldVisitor visitField(int access, String name, String descriptor, String signature, Object value) { - if (name.startsWith("comp_")) { - super.visitRecordComponent(name, descriptor, signature); - } - - return super.visitField(access, name, descriptor, signature, value); - } - } - } - - return next - } - } + mapJar(intermediaryJar, mergedFile, tinyInput, libraries, "official", "intermediary") } } @@ -811,9 +776,6 @@ task v2UnmergedYarnJar(dependsOn: [insertAutoGeneratedEnumMappings, combineUnpic expand version: project.unpick_version rename unpickMetaFile.name, "extras/unpick.json" } - from(recordSignaturesJson) { - into "extras/" - } destinationDirectory.set(file("build/libs")) } @@ -833,9 +795,6 @@ task v2MergedYarnJar(dependsOn: ["mergeV2"], type: Jar) { expand version: project.unpick_version rename unpickMetaFile.name, "extras/unpick.json" } - from(recordSignaturesJson) { - into "extras/" - } destinationDirectory.set(file("build/libs")) } diff --git a/mappings/net/minecraft/block/EntityShapeContext.mapping b/mappings/net/minecraft/block/EntityShapeContext.mapping index a5af8fbb1d..66fdf8e856 100644 --- a/mappings/net/minecraft/block/EntityShapeContext.mapping +++ b/mappings/net/minecraft/block/EntityShapeContext.mapping @@ -4,17 +4,13 @@ CLASS net/minecraft/class_3727 net/minecraft/block/EntityShapeContext FIELD field_17593 ABSENT Lnet/minecraft/class_3726; FIELD field_17594 heldItem Lnet/minecraft/class_1799; FIELD field_24425 walkOnFluidPredicate Ljava/util/function/Predicate; - FIELD field_27934 boots Lnet/minecraft/class_1799; FIELD field_27935 entity Lnet/minecraft/class_1297; METHOD (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD (ZDLnet/minecraft/class_1799;Lnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_1297;)V + METHOD (ZDLnet/minecraft/class_1799;Ljava/util/function/Predicate;Lnet/minecraft/class_1297;)V ARG 1 descending ARG 2 minY ARG 4 boots - ARG 5 heldItem - ARG 6 walkOnFluidPredicate - ARG 7 entity METHOD method_27867 (Lnet/minecraft/class_3611;)Z ARG 0 fluid METHOD method_27868 (Lnet/minecraft/class_3611;)Z diff --git a/mappings/net/minecraft/block/ShapeContext.mapping b/mappings/net/minecraft/block/ShapeContext.mapping index 75808214ab..fc8a9ee3f6 100644 --- a/mappings/net/minecraft/block/ShapeContext.mapping +++ b/mappings/net/minecraft/block/ShapeContext.mapping @@ -12,5 +12,3 @@ CLASS net/minecraft/class_3726 net/minecraft/block/ShapeContext METHOD method_27866 canWalkOnFluid (Lnet/minecraft/class_3610;Lnet/minecraft/class_3609;)Z ARG 1 state ARG 2 fluid - METHOD method_35591 isWearingOnFeet (Lnet/minecraft/class_1792;)Z - ARG 1 item diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 1b2cc5de98..56b5647551 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -131,12 +131,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 o METHOD method_17681 getWidth ()F METHOD method_17682 getHeight ()F - METHOD method_17833 adjustSingleAxisMovementForCollisions (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;Lnet/minecraft/class_3726;Ljava/util/List;)Lnet/minecraft/class_243; - ARG 0 movement - ARG 1 entityBoundingBox - ARG 2 world - ARG 3 context - ARG 4 collisions METHOD method_17835 adjustMovementForCollisions (Lnet/minecraft/class_243;)Lnet/minecraft/class_243; ARG 1 movement METHOD method_18002 createSpawnPacket ()Lnet/minecraft/class_2596; @@ -202,13 +196,10 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 destX ARG 3 destY ARG 5 destZ - METHOD method_20736 adjustMovementForCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Lnet/minecraft/class_3726;Ljava/util/List;)Lnet/minecraft/class_243; + METHOD method_20736 adjustMovementForCollisions (Lnet/minecraft/class_1297;Lnet/minecraft/class_243;Lnet/minecraft/class_238;Lnet/minecraft/class_1937;Ljava/util/List;)Lnet/minecraft/class_243; ARG 0 entity - ARG 1 movement ARG 2 entityBoundingBox ARG 3 world - ARG 4 context - ARG 5 collisions METHOD method_20737 adjustMovementForCollisions (Lnet/minecraft/class_243;Lnet/minecraft/class_238;Ljava/util/List;)Lnet/minecraft/class_243; ARG 0 movement ARG 1 entityBoundingBox diff --git a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping index 0619b4ad9a..cc7c5a4962 100644 --- a/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping +++ b/mappings/net/minecraft/server/world/ThreadedAnvilChunkStorage.mapping @@ -143,8 +143,6 @@ CLASS net/minecraft/class_3898 net/minecraft/server/world/ThreadedAnvilChunkStor ARG 3 holder METHOD method_20582 (Lnet/minecraft/class_2791;)Z ARG 0 chunk - METHOD method_20583 (Lnet/minecraft/class_3193;)V - ARG 1 chunkHolder METHOD method_20584 (Lnet/minecraft/class_3193;)Lnet/minecraft/class_2791; ARG 1 chunkHolder METHOD method_20605 unloadChunks (Ljava/util/function/BooleanSupplier;)V diff --git a/mappings/net/minecraft/util/shape/VoxelShape.mapping b/mappings/net/minecraft/util/shape/VoxelShape.mapping index 3c1a71b967..567fa3eb85 100644 --- a/mappings/net/minecraft/util/shape/VoxelShape.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShape.mapping @@ -62,10 +62,6 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape METHOD method_33661 getClosestPointTo (Lnet/minecraft/class_243;)Ljava/util/Optional; COMMENT {@return the closest point in the shape to {@code target}} ARG 1 target - METHOD method_35593 getStartingCoord (Lnet/minecraft/class_2350$class_2351;DD)D - ARG 1 axis - ARG 2 from - ARG 4 to METHOD method_33662 (Lnet/minecraft/class_243;[Lnet/minecraft/class_243;DDDDDD)V ARG 2 minX ARG 4 minY @@ -73,3 +69,7 @@ CLASS net/minecraft/class_265 net/minecraft/util/shape/VoxelShape ARG 8 maxX ARG 10 maxY ARG 12 maxZ + METHOD method_35593 getStartingCoord (Lnet/minecraft/class_2350$class_2351;DD)D + ARG 1 axis + ARG 2 from + ARG 4 to diff --git a/mappings/net/minecraft/util/shape/VoxelShapes.mapping b/mappings/net/minecraft/util/shape/VoxelShapes.mapping index d6047f0f1e..4fe21bb22e 100644 --- a/mappings/net/minecraft/util/shape/VoxelShapes.mapping +++ b/mappings/net/minecraft/util/shape/VoxelShapes.mapping @@ -78,24 +78,6 @@ CLASS net/minecraft/class_259 net/minecraft/util/shape/VoxelShapes METHOD method_17786 union (Lnet/minecraft/class_265;[Lnet/minecraft/class_265;)Lnet/minecraft/class_265; ARG 0 first ARG 1 others - METHOD method_17943 clamp (DDD)I - ARG 0 value - ARG 2 min - ARG 4 max - METHOD method_17944 calculatePushVelocity (Lnet/minecraft/class_238;Lnet/minecraft/class_4538;DLnet/minecraft/class_3726;Lnet/minecraft/class_2335;Ljava/lang/Iterable;)D - ARG 0 box - ARG 1 world - ARG 2 initial - ARG 4 context - ARG 5 direction - ARG 6 shapes - METHOD method_17945 calculatePushVelocity (Lnet/minecraft/class_2350$class_2351;Lnet/minecraft/class_238;Lnet/minecraft/class_4538;DLnet/minecraft/class_3726;Ljava/lang/Iterable;)D - ARG 0 axis - ARG 1 box - ARG 2 world - ARG 3 initial - ARG 5 context - ARG 6 shapes METHOD method_20713 unionCoversFullCube (Lnet/minecraft/class_265;Lnet/minecraft/class_265;)Z ARG 0 one ARG 1 two diff --git a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping index 08ef787e6e..0677d56087 100644 --- a/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping +++ b/mappings/net/minecraft/world/gen/feature/DefaultBiomeFeatures.mapping @@ -53,8 +53,6 @@ CLASS net/minecraft/class_3864 net/minecraft/world/gen/feature/DefaultBiomeFeatu ARG 0 builder METHOD method_16985 addBadlandsVegetation (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder - METHOD method_16986 addJungleVegetation (Lnet/minecraft/class_5485$class_5495;)V - ARG 0 builder METHOD method_16987 addDesertVegetation (Lnet/minecraft/class_5485$class_5495;)V ARG 0 builder METHOD method_16988 addSwampVegetation (Lnet/minecraft/class_5485$class_5495;)V diff --git a/record_signatures.json b/record_signatures.json deleted file mode 100644 index 1115a60fb0..0000000000 --- a/record_signatures.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "net/minecraft/class_2841$class_6561": "Ljava/lang/Record;", - "net/minecraft/class_2841$class_6562": "Ljava/lang/Record;", - "net/minecraft/class_6497": ";>Ljava/lang/Record;", - "net/minecraft/class_6535": "Ljava/lang/Record;", - "net/minecraft/class_2769$class_4933": ";>Ljava/lang/Record;", - "net/minecraft/class_6759": "Ljava/lang/Record;", - "net/minecraft/class_6760": "Ljava/lang/Record;", - "net/minecraft/class_5699$class_6739": "Ljava/lang/Record;Lcom/mojang/serialization/Codec;", - "net/minecraft/class_6492$class_6738": "Ljava/lang/Record;Lnet/minecraft/class_6492;", - "net/minecraft/class_2370$class_5501": "Ljava/lang/Record;", - "net/minecraft/class_5455$class_5456": "Ljava/lang/Record;", - "net/minecraft/class_5506$class_6822": "Ljava/lang/Record;", - "net/minecraft/class_6622$class_6623": "Ljava/lang/Record;", - "net/minecraft/class_6834$class_6835": "Ljava/lang/Record;" -}