mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

1.18-pre2

This commit is contained in:
modmuss50 2021-11-16 18:18:51 +00:00
parent 36069d7693
commit d792ab8d27
15 changed files with 18 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
build.gradle
View File

@ -27,7 +27,7 @@ plugins {
id 'net.fabricmc.filament' version '0.3.0'
}
def minecraft_version = "1.18-pre1"
def minecraft_version = "1.18-pre2"
def ENV = System.getenv()
// Fetch build number from Github Actions
@ -714,12 +714,12 @@ task unpickIntermediaryJar(type: JavaExec, dependsOn: [mapIntermediaryJar, "cons
// Setup the build for the unpicked constants
sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
it.options.release = 16
it.options.release = 17
}
sourceSets {
@ -841,11 +841,6 @@ task v2MergedYarnJar(dependsOn: ["mergeV2"], type: Jar) {
def fakeSourceDir = file(".gradle/temp/fakeSource")
task genFakeSource(type: JavaExec, dependsOn: ["mergeV2", "mapNamedJar"]) {
onlyIf {
// Mapping Poet requires Java 17
JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)
}
group = "javadoc generation"
outputs.upToDateWhen { false }
@ -884,7 +879,7 @@ javadoc {
// verbose = true // enable to debug
options {
// verbose() // enable to debug
source = "16"
source = "17"
encoding = 'UTF-8'
charSet = 'UTF-8'
memberLevel = JavadocMemberLevel.PRIVATE
@ -914,9 +909,9 @@ javadoc {
'https://commons.apache.org/proper/commons-codec/archives/1.10/apidocs',
'https://commons.apache.org/proper/commons-compress/javadocs/api-1.8.1/',
"https://maven.fabricmc.net/docs/fabric-loader-${project.fabric_loader_version}/",
"https://docs.oracle.com/en/java/javase/16/docs/api/"
"https://docs.oracle.com/en/java/javase/17/docs/api/"
)
// https://docs.oracle.com/en/java/javase/16/docs/specs/man/javadoc.html#additional-options-provided-by-the-standard-doclet
// https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#additional-options-provided-by-the-standard-doclet
addBooleanOption 'Xdoclint:html', true
addBooleanOption 'Xdoclint:syntax', true
addBooleanOption 'Xdoclint:reference', true

6
mappings/net/minecraft/block/entity/SkullBlockEntity.mapping
View File

@ -15,10 +15,6 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity
METHOD method_11335 loadProperties (Lcom/mojang/authlib/GameProfile;Ljava/util/function/Consumer;)V
ARG 0 owner
ARG 1 callback
METHOD method_11336 setSessionService (Lcom/mojang/authlib/minecraft/MinecraftSessionService;)V
ARG 0 value
METHOD method_11337 setUserCache (Lnet/minecraft/class_3312;)V
ARG 0 value
METHOD method_11338 getTicksPowered (F)F
ARG 1 tickDelta
METHOD method_11339 loadOwnerProperties ()V
@ -31,8 +27,6 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity
ARG 1 profile
METHOD method_37249 (Lcom/mojang/authlib/GameProfile;)V
ARG 1 owner
METHOD method_37428 setExecutor (Ljava/util/concurrent/Executor;)V
ARG 0 executor
METHOD method_37468 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;Ljava/util/Optional;)V
ARG 2 profile
METHOD method_37469 (Ljava/util/function/Consumer;Lcom/mojang/authlib/GameProfile;)V

8
mappings/net/minecraft/class_6621.mapping
View File

@ -1,8 +0,0 @@
CLASS net/minecraft/class_6621
METHOD afterPlace (Lnet/minecraft/class_5281;Lnet/minecraft/class_5138;Lnet/minecraft/class_2794;Ljava/util/Random;Lnet/minecraft/class_3341;Lnet/minecraft/class_1923;Lnet/minecraft/class_6624;)V
ARG 1 world
ARG 2 structures
ARG 3 chunkGenerator
ARG 4 random
ARG 5 box
ARG 6 pos

3
mappings/net/minecraft/client/render/entity/model/MinecartEntityModel.mapping
View File

@ -28,9 +28,6 @@ CLASS net/minecraft/class_580 net/minecraft/client/render/entity/model/MinecartE
COMMENT </table>
COMMENT </div>
FIELD field_27452 root Lnet/minecraft/class_630;
FIELD field_27453 contents Lnet/minecraft/class_630;
FIELD field_32511 CONTENTS Ljava/lang/String;
COMMENT The key of the contents model part, whose value is {@value}.
METHOD <init> (Lnet/minecraft/class_630;)V
ARG 1 root
METHOD method_32020 getTexturedModelData ()Lnet/minecraft/class_5607;

3
mappings/net/minecraft/entity/Entity.mapping
View File

@ -53,9 +53,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity
FIELD field_34927 collidedSoftly Z
COMMENT Whether the collision velocity (speed at which the entity hit a given surface)
COMMENT is lower than {@link Entity#MAX_SOFT_COLLISION_SPEED}.
FIELD field_34928 MAX_SOFT_COLLISION_SPEED F
COMMENT Collisions at a speed lower than this are considered "soft".
COMMENT Used by players to determine whether to stop sprinting when hitting a wall.
FIELD field_35101 chunkPos Lnet/minecraft/class_1923;
FIELD field_35588 blockStateAtPos Lnet/minecraft/class_2680;
FIELD field_5951 ridingCooldown I

7
mappings/net/minecraft/world/biome/SpawnSettings.mapping
View File

@ -5,13 +5,11 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings
FIELD field_26406 spawnCosts Ljava/util/Map;
FIELD field_26645 LOGGER Lorg/apache/logging/log4j/Logger;
FIELD field_26646 INSTANCE Lnet/minecraft/class_5483;
FIELD field_26692 playerSpawnFriendly Z
FIELD field_30982 EMPTY_ENTRY_POOL Lnet/minecraft/class_6012;
METHOD <init> (FLjava/util/Map;Ljava/util/Map;Z)V
METHOD <init> (FLjava/util/Map;Ljava/util/Map;)V
ARG 1 creatureSpawnProbability
ARG 2 spawners
ARG 3 spawnCosts
ARG 4 playerSpawnFriendly
METHOD method_30791 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_31002 getCreatureSpawnProbability ()F
@ -19,7 +17,6 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings
ARG 1 entityType
METHOD method_31004 getSpawnEntries (Lnet/minecraft/class_1311;)Lnet/minecraft/class_6012;
ARG 1 spawnGroup
METHOD method_31082 isPlayerSpawnFriendly ()Z
CLASS class_1964 SpawnEntry
FIELD field_24681 CODEC Lcom/mojang/serialization/Codec;
FIELD field_9387 maxGroupSize I
@ -61,7 +58,6 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings
FIELD field_26647 spawners Ljava/util/Map;
FIELD field_26648 spawnCosts Ljava/util/Map;
FIELD field_26649 creatureSpawnProbability F
FIELD field_26693 playerSpawnFriendly Z
METHOD method_31007 build ()Lnet/minecraft/class_5483;
METHOD method_31008 creatureSpawnProbability (F)Lnet/minecraft/class_5483$class_5496;
ARG 1 probability
@ -72,4 +68,3 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings
METHOD method_31011 spawn (Lnet/minecraft/class_1311;Lnet/minecraft/class_5483$class_1964;)Lnet/minecraft/class_5483$class_5496;
ARG 1 spawnGroup
ARG 2 spawnEntry
METHOD method_31083 playerSpawnFriendly ()Lnet/minecraft/class_5483$class_5496;

8
mappings/net/minecraft/world/chunk/BelowZeroRetrogen.mapping
View File

@ -12,15 +12,7 @@ CLASS net/minecraft/class_6746 net/minecraft/world/chunk/BelowZeroRetrogen
METHOD method_39319 getTargetStatus ()Lnet/minecraft/class_2806;
METHOD method_39326 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_6746;
ARG 0 nbt
METHOD method_39466 isMissingBedrockAt (II)Z
ARG 1 x
ARG 2 z
METHOD method_39467 replaceOldBedrock (Lnet/minecraft/class_2839;)V
ARG 0 chunk
METHOD method_39468 (Lnet/minecraft/class_2839;Lnet/minecraft/class_2338;)V
ARG 1 pos
METHOD method_39469 hasMissingBedrock ()Z
METHOD method_39470 fillColumnWithAirIfMissingBedrock (Lnet/minecraft/class_2839;)V
ARG 1 chunk
METHOD method_39471 (Lnet/minecraft/class_2839;Lnet/minecraft/class_2338;)V
ARG 1 pos

2
mappings/net/minecraft/world/gen/StructureAccessor.mapping
View File

@ -37,4 +37,4 @@ CLASS net/minecraft/class_5138 net/minecraft/world/gen/StructureAccessor
COMMENT position is in the expanded bounding box of the structure but not in any
COMMENT child piece of it.
ARG 1 pos
ARG 2 structure
ARG 2 structure

7
mappings/net/minecraft/world/gen/carver/Carver.mapping
View File

@ -22,13 +22,6 @@ CLASS net/minecraft/class_2939 net/minecraft/world/gen/carver/Carver
METHOD method_12705 shouldCarve (Lnet/minecraft/class_5871;Ljava/util/Random;)Z
ARG 1 config
ARG 2 random
METHOD method_12706 isOnBoundary (IIIIII)Z
ARG 0 x
ARG 1 z
ARG 2 minX
ARG 3 maxX
ARG 4 minZ
ARG 5 maxZ
METHOD method_12709 canAlwaysCarveBlock (Lnet/minecraft/class_2680;)Z
ARG 1 state
METHOD method_12710 getBranchFactor ()I

5
mappings/net/minecraft/world/gen/chunk/ChunkGenerator.mapping
View File

@ -123,10 +123,7 @@ CLASS net/minecraft/class_2794 net/minecraft/world/gen/chunk/ChunkGenerator
ARG 1 registry
ARG 2 condition
ARG 3 biome
METHOD method_38275 populateBiomes (Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
ARG 1 executor
ARG 3 structureAccessor
ARG 4 chunk
METHOD method_38275 populateBiomes (Lnet/minecraft/class_2378;Ljava/util/concurrent/Executor;Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)Ljava/util/concurrent/CompletableFuture;
METHOD method_38276 getMultiNoiseSampler ()Lnet/minecraft/class_6544$class_6552;
METHOD method_38669 (Lnet/minecraft/class_2378;Lnet/minecraft/class_1959;)Ljava/util/stream/Stream;
ARG 1 biome

2
mappings/net/minecraft/world/gen/chunk/NoiseChunkGenerator.mapping
View File

@ -37,8 +37,6 @@ CLASS net/minecraft/class_3754 net/minecraft/world/gen/chunk/NoiseChunkGenerator
ARG 5 z
METHOD method_38326 (Lnet/minecraft/class_6568;III)Lnet/minecraft/class_6544$class_6553;
ARG 3 y
METHOD method_38327 (Lnet/minecraft/class_6748;Lnet/minecraft/class_5138;Lnet/minecraft/class_2791;)V
ARG 2 world
METHOD method_39041 (Lnet/minecraft/class_5873;Ljava/util/function/Function;Lnet/minecraft/class_2791;Lnet/minecraft/class_6568;Lnet/minecraft/class_2338;Z)Ljava/util/Optional;
ARG 1 context
ARG 3 chunk

14
mappings/net/minecraft/world/gen/decorator/PlacedFeatures.mapping
View File

@ -1,14 +0,0 @@
CLASS net/minecraft/class_6817 net/minecraft/world/gen/decorator/PlacedFeatures
FIELD field_36078 MOTION_BLOCKING_HEIGHTMAP Lnet/minecraft/class_6797;
FIELD field_36079 OCEAN_FLOOR_WG_HEIGHTMAP Lnet/minecraft/class_6797;
FIELD field_36080 WORLD_SURFACE_WG_HEIGHTMAP Lnet/minecraft/class_6797;
FIELD field_36081 OCEAN_FLOOR_HEIGHTMAP Lnet/minecraft/class_6797;
FIELD field_36082 BOTTOM_TO_TOP_RANGE Lnet/minecraft/class_6797;
FIELD field_36083 TEN_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797;
FIELD field_36084 EIGHT_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797;
FIELD field_36085 FOUR_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797;
FIELD field_36086 BOTTOM_TO_120_RANGE Lnet/minecraft/class_6797;
METHOD method_39735 getDefaultPlacedFeature ()Lnet/minecraft/class_6796;
METHOD method_39737 register (Ljava/lang/String;Lnet/minecraft/class_6796;)Lnet/minecraft/class_6796;
ARG 0 id
ARG 1 feature

7
mappings/net/minecraft/world/gen/feature/LargeDripstoneFeature.mapping
View File

@ -1,12 +1,11 @@
CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFeature
METHOD method_33016 createGenerator (Lnet/minecraft/class_2338;ZLjava/util/Random;ILnet/minecraft/class_5863;Lnet/minecraft/class_5863;I)Lnet/minecraft/class_5727$class_5728;
METHOD method_33016 createGenerator (Lnet/minecraft/class_2338;ZLjava/util/Random;ILnet/minecraft/class_5863;Lnet/minecraft/class_5863;)Lnet/minecraft/class_5727$class_5728;
ARG 0 pos
ARG 1 isStalagmite
ARG 2 random
ARG 3 scale
ARG 4 bluntness
ARG 5 heightScale
ARG 6 maxY
METHOD method_35360 testGeneration (Lnet/minecraft/class_5281;Lnet/minecraft/class_2338;Lnet/minecraft/class_5721$class_5723;Lnet/minecraft/class_5727$class_5729;)V
ARG 1 world
ARG 2 pos
@ -18,14 +17,12 @@ CLASS net/minecraft/class_5727 net/minecraft/world/gen/feature/LargeDripstoneFea
FIELD field_28208 scale I
FIELD field_28209 bluntness D
FIELD field_28210 heightScale D
FIELD field_35634 maxY I
METHOD <init> (Lnet/minecraft/class_2338;ZIDDI)V
METHOD <init> (Lnet/minecraft/class_2338;ZIDD)V
ARG 1 pos
ARG 2 isStalagmite
ARG 3 scale
ARG 4 bluntness
ARG 6 heightScale
ARG 8 maxY
METHOD method_33017 getBaseScale ()I
METHOD method_33018 scale (F)I
ARG 1 height

4
mappings/net/minecraft/world/gen/feature/PlacedFeatures.mapping
View File

@ -4,7 +4,11 @@ CLASS net/minecraft/class_6817 net/minecraft/world/gen/feature/PlacedFeatures
FIELD field_36080 WORLD_SURFACE_WG_HEIGHTMAP Lnet/minecraft/class_6797;
FIELD field_36081 OCEAN_FLOOR_HEIGHTMAP Lnet/minecraft/class_6797;
FIELD field_36082 BOTTOM_TO_TOP_RANGE Lnet/minecraft/class_6797;
FIELD field_36083 TEN_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797;
FIELD field_36084 EIGHT_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797;
FIELD field_36085 FOUR_ABOVE_AND_BELOW_RANGE Lnet/minecraft/class_6797;
FIELD field_36086 BOTTOM_TO_120_RANGE Lnet/minecraft/class_6797;
METHOD method_39735 getDefaultPlacedFeature ()Lnet/minecraft/class_6796;
METHOD method_39737 register (Ljava/lang/String;Lnet/minecraft/class_6796;)Lnet/minecraft/class_6796;
ARG 0 id
ARG 1 feature

8
settings.gradle
View File

@ -9,13 +9,9 @@ pluginManagement {
}
}
// This check is done here before any plugins that may require java 16 are able to load.
if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_16)) {
throw new UnsupportedOperationException("Yarn's buildscript requires Java 16 or higher.")
}
// This check is done here before any plugins that may require java 17 are able to load.
if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
System.err.println("Java 17 is highly recommended for using yarn. Javadoc generation will be disabled.")
throw new UnsupportedOperationException("Yarn's buildscript requires Java 17 or higher.")
}
rootProject.name = "yarn"