This commit is contained in:
modmuss50 2024-04-03 15:13:48 +01:00
parent 08282853a9
commit 5dac06e01e
18 changed files with 26 additions and 77 deletions

View File

@ -4,7 +4,7 @@ jobs:
build:
strategy:
matrix:
java: [17-jdk, 21-jdk]
java: [21-jdk]
runs-on: ubuntu-22.04
container:
image: eclipse-temurin:${{ matrix.java }}

View File

@ -20,7 +20,7 @@ plugins {
id 'net.fabricmc.filament'
}
def minecraft_version = "24w13a"
def minecraft_version = "24w14a"
filament {
minecraftVersion = minecraft_version
@ -276,13 +276,13 @@ combineUnpickDefinitions {
// Setup the build for the unpicked constants
java {
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
sourceCompatibility = JavaVersion.VERSION_21
targetCompatibility = JavaVersion.VERSION_21
}
tasks.withType(JavaCompile).configureEach {
it.options.encoding = "UTF-8"
it.options.release = 17
it.options.release = 21
}
tasks.withType(AbstractArchiveTask).configureEach {
@ -475,7 +475,7 @@ javadoc {
// verbose = true // enable to debug
options {
// verbose() // enable to debug
source = "17"
source = "21"
encoding = 'UTF-8'
charSet = 'UTF-8'
memberLevel = JavadocMemberLevel.PRIVATE
@ -513,7 +513,7 @@ javadoc {
'https://commons.apache.org/proper/commons-compress/apidocs/',
'https://hc.apache.org/httpcomponents-client-4.5.x/current/httpclient/apidocs/',
"https://maven.fabricmc.net/docs/fabric-loader-${project.fabric_loader_version}/",
"https://docs.oracle.com/en/java/javase/17/docs/api/"
"https://docs.oracle.com/en/java/javase/21/docs/api/"
)
// https://docs.oracle.com/en/java/javase/17/docs/specs/man/javadoc.html#additional-options-provided-by-the-standard-doclet
addBooleanOption 'Xdoclint:html', true

View File

@ -265,16 +265,14 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block
ARG 3 state
ARG 4 placer
ARG 5 itemStack
METHOD method_9568 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1922;Ljava/util/List;Lnet/minecraft/class_1836;Lnet/minecraft/class_5455;)V
METHOD method_9568 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1792$class_9635;Ljava/util/List;Lnet/minecraft/class_1836;)V
COMMENT Appends tooltips to a stack of this block's corresponding {@linkplain
COMMENT net.minecraft.item.BlockItem block item}. Used by shulker boxes.
COMMENT
COMMENT @see Item#appendTooltip
ARG 1 stack
ARG 2 world
ARG 3 tooltip
ARG 4 options
ARG 5 registryManager
METHOD method_9574 getPickStack (Lnet/minecraft/class_4538;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Lnet/minecraft/class_1799;
COMMENT {@return the new item stack when using pick block functionality}
COMMENT

View File

@ -1,6 +1,5 @@
CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity
FIELD field_12087 owner Lnet/minecraft/class_9296;
FIELD field_12089 userCache Lcom/google/common/cache/LoadingCache;
FIELD field_34029 currentExecutor Ljava/util/concurrent/Executor;
FIELD field_41315 poweredTicks I
FIELD field_41316 powered Z
@ -34,12 +33,6 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity
ARG 0 runnable
METHOD method_52580 fetchProfile (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture;
ARG 0 name
METHOD method_54081 fetchProfile (Ljava/lang/String;Lnet/minecraft/class_7497;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture;
ARG 0 name
ARG 1 apiServices
ARG 2 missingUserCache
METHOD method_54082 (Ljava/util/function/BooleanSupplier;Lnet/minecraft/class_7497;Ljava/util/Optional;)Ljava/util/Optional;
ARG 2 profile
METHOD method_58126 (Lnet/minecraft/class_9296;)V
ARG 1 owner
CLASS 1

View File

@ -47,7 +47,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_1689 framebuffer Lnet/minecraft/class_276;
FIELD field_1690 options Lnet/minecraft/class_315;
FIELD field_1692 targetedEntity Lnet/minecraft/class_1297;
FIELD field_1693 is64Bit Z
FIELD field_1695 windowFocused Z
FIELD field_1696 thread Ljava/lang/Thread;
FIELD field_1697 runDirectory Ljava/io/File;
@ -165,7 +164,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_37856 gpuUtilizationPercentage D
FIELD field_37857 currentGlTimerQuery Lnet/minecraft/class_7168$class_7169;
FIELD field_39068 profileKeys Lnet/minecraft/class_7853;
FIELD field_39317 realms32BitWarningChecker Lnet/minecraft/class_7478;
FIELD field_39420 authenticationService Lcom/mojang/authlib/yggdrasil/YggdrasilAuthenticationService;
FIELD field_39492 abuseReportContext Lnet/minecraft/class_7574;
FIELD field_39718 realmsPeriodicCheckers Lnet/minecraft/class_7578;
@ -191,7 +189,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
FIELD field_50035 mapDecorationsAtlasManager Lnet/minecraft/class_9443;
METHOD <init> (Lnet/minecraft/class_542;)V
ARG 1 args
METHOD method_1476 checkIs64Bit ()Z
METHOD method_1478 getResourceManager ()Lnet/minecraft/class_3300;
METHOD method_1479 getResourcePackDir ()Ljava/nio/file/Path;
METHOD method_1480 getItemRenderer ()Lnet/minecraft/class_918;
@ -264,7 +261,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
METHOD method_1534 getLastFrameDuration ()F
METHOD method_1536 doAttack ()Z
METHOD method_1538 getMusicTracker ()Lnet/minecraft/class_1142;
METHOD method_1540 is64Bit ()Z
METHOD method_1541 getBlockRenderManager ()Lnet/minecraft/class_776;
METHOD method_1542 isInSingleplayer ()Z
METHOD method_1543 getDataFixer ()Lcom/mojang/datafixers/DataFixer;
@ -477,7 +473,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient
ARG 0 stacks
METHOD method_43764 (Ljava/util/List;)Lnet/minecraft/class_1123;
ARG 0 stacks
METHOD method_44024 getRealms32BitWarningChecker ()Lnet/minecraft/class_7478;
METHOD method_44256 getServicesSignatureVerifier ()Lnet/minecraft/class_7500;
METHOD method_44352 (Z)V
ARG 1 confirmed

View File

@ -1,8 +0,0 @@
CLASS net/minecraft/class_7064 net/minecraft/client/gui/screen/Realms32BitWarningScreen
FIELD field_37212 HEADER Lnet/minecraft/class_2561;
FIELD field_37213 MESSAGE Lnet/minecraft/class_2561;
FIELD field_37214 CHECK_MESSAGE Lnet/minecraft/class_2561;
FIELD field_37215 NARRATED_TEXT Lnet/minecraft/class_2561;
FIELD field_39353 parent Lnet/minecraft/class_437;
METHOD <init> (Lnet/minecraft/class_437;)V
ARG 1 parent

View File

@ -180,7 +180,6 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions
FIELD field_34959 simulationDistance Lnet/minecraft/class_7172;
FIELD field_35426 showAutosaveIndicator Lnet/minecraft/class_7172;
FIELD field_35637 allowServerListing Lnet/minecraft/class_7172;
FIELD field_37208 skipRealms32BitWarning Z
FIELD field_37877 directionalAudio Lnet/minecraft/class_7172;
FIELD field_37878 DARK_MOJANG_STUDIOS_BACKGROUND_COLOR_TOOLTIP Lnet/minecraft/class_2561;
FIELD field_37879 HIDE_LIGHTNING_FLASHES_TOOLTIP Lnet/minecraft/class_2561;

View File

@ -1,13 +0,0 @@
CLASS net/minecraft/class_7478 net/minecraft/client/realms/util/Realms32BitWarningChecker
FIELD field_39322 LOGGER Lorg/slf4j/Logger;
FIELD field_39323 client Lnet/minecraft/class_310;
FIELD field_39324 subscriptionRetrievalFuture Ljava/util/concurrent/CompletableFuture;
FIELD field_39325 skipDisplay Z
METHOD <init> (Lnet/minecraft/class_310;)V
ARG 1 client
METHOD method_44027 isSubscribed ()Ljava/lang/Boolean;
METHOD method_44028 (Lnet/minecraft/class_4877;)Z
ARG 1 server
METHOD method_44029 showWarningIfNeeded (Lnet/minecraft/class_437;)V
ARG 1 parent
METHOD method_44030 isSubscribedInternal ()Z

View File

@ -1,36 +1,34 @@
CLASS net/minecraft/class_9276 net/minecraft/component/type/BundleContentsComponent
FIELD field_49288 MAX_SIZE I
FIELD field_49289 DEFAULT Lnet/minecraft/class_9276;
FIELD field_49290 CODEC Lcom/mojang/serialization/Codec;
FIELD field_49291 PACKET_CODEC Lnet/minecraft/class_9139;
FIELD field_49292 NESTED_BUNDLE_OCCUPANCY I
FIELD field_49292 NESTED_BUNDLE_OCCUPANCY Lorg/apache/commons/lang3/math/Fraction;
FIELD field_49293 ADD_TO_NEW_SLOT I
FIELD field_49294 stacks Ljava/util/List;
FIELD field_49295 occupancy I
FIELD field_49295 occupancy Lorg/apache/commons/lang3/math/Fraction;
METHOD <init> (Ljava/util/List;)V
ARG 1 stacks
METHOD <init> (Ljava/util/List;I)V
METHOD <init> (Ljava/util/List;Lorg/apache/commons/lang3/math/Fraction;)V
ARG 1 stacks
ARG 2 occupancy
METHOD equals (Ljava/lang/Object;)Z
ARG 1 o
METHOD method_57421 stream ()Ljava/util/stream/Stream;
METHOD method_57422 get (I)Lnet/minecraft/class_1799;
ARG 1 index
METHOD method_57423 getOccupancy (Lnet/minecraft/class_1799;)I
METHOD method_57423 getOccupancy (Lnet/minecraft/class_1799;)Lorg/apache/commons/lang3/math/Fraction;
ARG 0 stack
METHOD method_57424 (Lnet/minecraft/class_9276;)Ljava/util/List;
ARG 0 component
METHOD method_57425 calculateOccupancy (Ljava/util/List;)I
METHOD method_57425 calculateOccupancy (Ljava/util/List;)Lorg/apache/commons/lang3/math/Fraction;
ARG 0 stacks
METHOD method_57426 size ()I
METHOD method_57427 (Lnet/minecraft/class_9276;)Ljava/util/List;
ARG 0 component
METHOD method_57428 getOccupancy ()I
METHOD method_57428 getOccupancy ()Lorg/apache/commons/lang3/math/Fraction;
METHOD method_57429 isEmpty ()Z
CLASS class_9277 Builder
FIELD field_49296 stacks Ljava/util/List;
FIELD field_49297 occupancy I
FIELD field_49297 occupancy Lorg/apache/commons/lang3/math/Fraction;
METHOD <init> (Lnet/minecraft/class_9276;)V
ARG 1 base
METHOD method_57430 removeFirst ()Lnet/minecraft/class_1799;
@ -39,7 +37,7 @@ CLASS net/minecraft/class_9276 net/minecraft/component/type/BundleContentsCompon
ARG 2 player
METHOD method_57432 add (Lnet/minecraft/class_1799;)I
ARG 1 stack
METHOD method_57433 getOccupancy ()I
METHOD method_57433 getOccupancy ()Lorg/apache/commons/lang3/math/Fraction;
METHOD method_57434 addInternal (Lnet/minecraft/class_1799;)I
ARG 1 stack
METHOD method_57435 build ()Lnet/minecraft/class_9276;

View File

@ -5,7 +5,4 @@ CLASS net/minecraft/class_3553 net/minecraft/datafixer/fix/ChoiceTypesFix
ARG 1 outputSchema
ARG 2 name
ARG 3 types
METHOD method_15476 fixChoiceTypes (Ljava/lang/String;Lcom/mojang/datafixers/types/templates/TaggedChoice$TaggedChoiceType;Lcom/mojang/datafixers/types/templates/TaggedChoice$TaggedChoiceType;)Lcom/mojang/datafixers/TypeRewriteRule;
ARG 1 name
ARG 2 inputChoiceType
ARG 3 outputChoiceType
METHOD method_15476 fixChoiceTypes (Lcom/mojang/datafixers/types/templates/TaggedChoice$TaggedChoiceType;Lcom/mojang/datafixers/types/templates/TaggedChoice$TaggedChoiceType;)Lcom/mojang/datafixers/TypeRewriteRule;

View File

@ -3,7 +3,6 @@ CLASS net/minecraft/class_1676 net/minecraft/entity/projectile/ProjectileEntity
FIELD field_23740 leftOwner Z
FIELD field_28646 shot Z
FIELD field_33399 owner Lnet/minecraft/class_1297;
FIELD field_48746 deflected Z
METHOD method_24919 setVelocity (Lnet/minecraft/class_1297;FFFFF)V
COMMENT Sets velocity and updates rotation accordingly.
ARG 1 shooter

View File

@ -190,11 +190,10 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
COMMENT Called when the item is made by crafting, smelting, smithing, etc.
ARG 1 stack
ARG 2 world
METHOD method_7844 getAttributeModifiers (Lnet/minecraft/class_1304;)Lcom/google/common/collect/Multimap;
METHOD method_7844 getAttributeModifiers ()Lnet/minecraft/class_9285;
COMMENT {@return the attribute modifiers the item provides}
COMMENT
COMMENT <p>Tools and armor should override this to specify the attack damage or armor points.
ARG 1 slot
METHOD method_7847 useOnEntity (Lnet/minecraft/class_1799;Lnet/minecraft/class_1657;Lnet/minecraft/class_1309;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1269;
COMMENT Called on both the client and the server when a player uses the item on an entity.
COMMENT
@ -211,11 +210,10 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item
ARG 3 entity
ARG 4 hand
METHOD method_7848 getName ()Lnet/minecraft/class_2561;
METHOD method_7851 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1937;Ljava/util/List;Lnet/minecraft/class_1836;)V
METHOD method_7851 appendTooltip (Lnet/minecraft/class_1799;Lnet/minecraft/class_1792$class_9635;Ljava/util/List;Lnet/minecraft/class_1836;)V
COMMENT Called by the client to append tooltips to an item. Subclasses can override
COMMENT this and add custom tooltips to {@code tooltip} list.
ARG 1 stack
ARG 2 world
ARG 3 tooltip
COMMENT the list of tooltips to show
ARG 4 context

View File

@ -413,9 +413,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack
ARG 1 world
ARG 2 user
ARG 3 remainingUseTicks
METHOD method_7950 getTooltip (Lnet/minecraft/class_1657;Lnet/minecraft/class_1836;)Ljava/util/List;
ARG 1 player
ARG 2 context
METHOD method_7950 getTooltip (Lnet/minecraft/class_1792$class_9635;Lnet/minecraft/class_1657;Lnet/minecraft/class_1836;)Ljava/util/List;
METHOD method_7951 isSuitableFor (Lnet/minecraft/class_2680;)Z
COMMENT Determines whether this item can be used as a suitable tool for mining the specified block.
COMMENT <p>

View File

@ -2,7 +2,6 @@ CLASS net/minecraft/class_9362 net/minecraft/item/MaceItem
FIELD field_49823 MINING_SPEED_MULTIPLIER F
FIELD field_49824 ATTACK_DAMAGE_MODIFIER_VALUE I
FIELD field_49825 ATTACK_SPEED_MODIFIER_VALUE F
FIELD field_49826 ATTRIBUTE_MODIFIERS Lcom/google/common/collect/ImmutableMultimap;
FIELD field_49999 KNOCKBACK_RANGE F
FIELD field_50000 KNOCKBACK_POWER F
FIELD field_50142 FALL_DISTANCE_MULTIPLIER F

View File

@ -1,7 +1,7 @@
CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunction
FIELD field_1105 attributes Ljava/util/List;
FIELD field_45836 CODEC Lcom/mojang/serialization/MapCodec;
METHOD <init> (Ljava/util/List;Ljava/util/List;)V
METHOD <init> (Ljava/util/List;Ljava/util/List;Z)V
ARG 1 conditions
ARG 2 attributes
METHOD method_32406 (Lnet/minecraft/class_137$class_138;)Ljava/util/stream/Stream;
@ -16,8 +16,6 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunct
ARG 0 function
METHOD method_53356 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;
ARG 0 instance
METHOD method_57647 (Lnet/minecraft/class_47;Lnet/minecraft/class_9285;)Lnet/minecraft/class_9285;
ARG 2 component
CLASS class_138 Attribute
FIELD comp_1859 name Ljava/lang/String;
FIELD comp_1860 attribute Lnet/minecraft/class_6880;

View File

@ -30,14 +30,10 @@ CLASS net/minecraft/class_8623 net/minecraft/util/collection/ArrayListDeque
ARG 1 index
METHOD method_52456 getRaw (I)Ljava/lang/Object;
ARG 1 index
METHOD offer (Ljava/lang/Object;)Z
ARG 1 value
METHOD offerFirst (Ljava/lang/Object;)Z
ARG 1 value
METHOD offerLast (Ljava/lang/Object;)Z
ARG 1 value
METHOD push (Ljava/lang/Object;)V
ARG 1 value
METHOD remove (I)Ljava/lang/Object;
ARG 1 index
METHOD removeFirstOccurrence (Ljava/lang/Object;)Z

View File

@ -15,6 +15,8 @@ CLASS net/minecraft/class_6008 net/minecraft/util/collection/Weighted
METHOD <init> (Ljava/lang/Object;Lnet/minecraft/class_6007;)V
ARG 1 data
ARG 2 weight
METHOD comp_2542 data ()Ljava/lang/Object;
METHOD comp_2543 weight ()Lnet/minecraft/class_6007;
METHOD method_34981 createCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec;
ARG 0 dataCodec
METHOD method_34982 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App;

View File

@ -9,9 +9,9 @@ pluginManagement {
}
}
// This check is done here before any plugins that may require java 17 are able to load.
if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_17)) {
throw new UnsupportedOperationException("Yarn's buildscript requires Java 17 or higher.")
// This check is done here before any plugins that may require java 21 are able to load.
if (!JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_21)) {
throw new UnsupportedOperationException("Yarn's buildscript requires Java 21 or higher.")
}
enableFeaturePreview "STABLE_CONFIGURATION_CACHE"