Skip to content

Commit a665806

Browse files
committed
Update to 1.21.11-rc3
1 parent f022399 commit a665806

File tree

122 files changed

+618
-431
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+618
-431
lines changed

build.gradle

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,12 @@ dependencies {
7373

7474
compileOnly 'com.demonwav.mcdev:annotations:2.0.0'
7575

76-
modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
77-
exclude group: 'net.fabricmc', module: 'fabric-loader'
78-
}
79-
productionRuntimeMods("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
80-
exclude group: 'net.fabricmc', module: 'fabric-loader'
81-
}
76+
// modRuntimeOnly("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
77+
// exclude group: 'net.fabricmc', module: 'fabric-loader'
78+
// }
79+
// productionRuntimeMods("me.djtheredstoner:DevAuth-fabric:${project.devauth_version}") {
80+
// exclude group: 'net.fabricmc', module: 'fabric-loader'
81+
// }
8282

8383
include api("net.fabricmc:mapping-io:${project.mapping_io_version}")
8484

checkstyle.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,9 @@
2424
<property name="query" value="//STATIC_IMPORT[./LITERAL_STATIC and not(.//STAR)]"/>
2525
<message key="matchxpath.match" value="Static imports should always use wildcard imports"/>
2626
</module>
27+
28+
<module name="IllegalImport">
29+
<property name="illegalClasses" value="org.jetbrains.annotations.Nullable, org.jetbrains.annotations.NotNull"/>
30+
</module>
2731
</module>
2832
</module>

gradle.properties

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx2G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/develop/
6-
minecraft_version=1.21.10
7-
minecraft_version_dependency=>=1.21.9 <=1.21.10
8-
minecraft_version_list=1.21.9,1.21.10
9-
minecraft_version_list_presentable=1.21.9 - 1.21.10
10-
loader_version=0.17.2
11-
loom_version=1.11-SNAPSHOT
6+
minecraft_version=1.21.11-rc3
7+
minecraft_version_dependency=1.21.11-rc.3
8+
minecraft_version_list=1.21.11
9+
minecraft_version_list_presentable=1.21.11
10+
loader_version=0.18.1
11+
loom_version=1.14-SNAPSHOT
1212

1313
# check these on https://maven.parchmentmc.org/org/parchmentmc/data/
14-
parchment_mcversion=1.21.9
15-
parchment_version=2025.10.05
14+
parchment_mcversion=1.21.10
15+
parchment_version=2025.10.12
1616

1717
# Mod Properties
1818
mod_version=2.12.3
@@ -21,10 +21,10 @@ org.gradle.jvmargs=-Xmx2G
2121

2222
# Dependencies
2323
# also check this on https://fabricmc.net/develop/
24-
fabric_version=0.134.1+1.21.10
25-
clientarguments_version=1.11.5
24+
fabric_version=0.139.4+1.21.11
25+
clientarguments_version=1.11.6
2626
betterconfig_version=2.4.0
27-
simplewaypoints_version=1.1.0
27+
simplewaypoints_version=1.2.0
2828
seedfinding_core_version=1.210.0
2929
seedfinding_biome_version=1.171.1
3030
seedfinding_feature_version=1.171.11

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
net/minecraft/world/item/enchantment/Enchantments.bootstrap (Lnet/minecraft/data/worldgen/BootstrapContext;)V <- net/minecraft/world/item/enchantment/effects/PlaySoundEffect.<init>
22
net/minecraft/world/item/enchantment/Enchantments.bootstrap (Lnet/minecraft/data/worldgen/BootstrapContext;)V <- net/minecraft/world/item/enchantment/effects/PlaySoundEffect.<init>
33
net/minecraft/world/item/enchantment/Enchantments.bootstrap (Lnet/minecraft/data/worldgen/BootstrapContext;)V <- net/minecraft/world/item/enchantment/effects/PlaySoundEffect.<init>
4+
net/minecraft/world/item/enchantment/Enchantments.bootstrap (Lnet/minecraft/data/worldgen/BootstrapContext;)V <- net/minecraft/world/item/enchantment/effects/PlaySoundEffect.<init>
45
net/minecraft/world/item/enchantment/effects/PlaySoundEffect.<clinit> ()V <- net/minecraft/world/item/enchantment/effects/PlaySoundEffect.lambda$static$0 <- net/minecraft/world/item/enchantment/effects/PlaySoundEffect.<init>

regressionTests/playerRandomHierarchy.regressiontest

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
net/minecraft/world/level/block/entity/BaseContainerBlockEntity.canUnlock (Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/LockCode;Lnet/minecraft/network/chat/Component;)Z <- net/minecraft/server/level/ServerPlayer.playNotifySound <- net/minecraft/world/entity/Entity.random
21
net/minecraft/server/level/ServerPlayer.playShoulderEntityAmbientSound (Lnet/minecraft/nbt/CompoundTag;)V <- net/minecraft/world/entity/Entity.random
32
net/minecraft/server/level/ServerPlayer.playShoulderEntityAmbientSound (Lnet/minecraft/nbt/CompoundTag;)V <- net/minecraft/world/entity/Entity.random
43
net/minecraft/server/level/ServerPlayer.playShoulderEntityAmbientSound (Lnet/minecraft/nbt/CompoundTag;)V <- net/minecraft/world/entity/Entity.random
@@ -32,17 +31,17 @@ net/minecraft/world/item/consume_effects/ApplyStatusEffectsConsumeEffect.apply (
3231
net/minecraft/world/item/consume_effects/TeleportRandomlyConsumeEffect.apply (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)Z <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
3332
net/minecraft/world/item/consume_effects/TeleportRandomlyConsumeEffect.apply (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)Z <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
3433
net/minecraft/world/item/consume_effects/TeleportRandomlyConsumeEffect.apply (Lnet/minecraft/world/level/Level;Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)Z <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
35-
net/minecraft/world/item/enchantment/Enchantment.modifyDamageFilteredValue (Lnet/minecraft/core/component/DataComponentType;Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyDamageFilteredValue$7 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
36-
net/minecraft/world/item/enchantment/Enchantment.modifyFishingLuckBonus (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
37-
net/minecraft/world/item/enchantment/Enchantment.modifyFishingTimeReduction (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
38-
net/minecraft/world/item/enchantment/Enchantment.modifyMobExperience (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
39-
net/minecraft/world/item/enchantment/Enchantment.modifyProjectileCount (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
40-
net/minecraft/world/item/enchantment/Enchantment.modifyProjectileSpread (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
41-
net/minecraft/world/item/enchantment/Enchantment.modifyTridentReturnToOwnerAcceleration (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$6 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
34+
net/minecraft/world/item/enchantment/Enchantment.modifyDamageFilteredValue (Lnet/minecraft/core/component/DataComponentType;Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyDamageFilteredValue$8 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
35+
net/minecraft/world/item/enchantment/Enchantment.modifyFishingLuckBonus (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$7 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
36+
net/minecraft/world/item/enchantment/Enchantment.modifyFishingTimeReduction (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$7 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
37+
net/minecraft/world/item/enchantment/Enchantment.modifyMobExperience (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$7 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
38+
net/minecraft/world/item/enchantment/Enchantment.modifyProjectileCount (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$7 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
39+
net/minecraft/world/item/enchantment/Enchantment.modifyProjectileSpread (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$7 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
40+
net/minecraft/world/item/enchantment/Enchantment.modifyTridentReturnToOwnerAcceleration (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/item/enchantment/Enchantment.modifyEntityFilteredValue <- net/minecraft/world/item/enchantment/Enchantment.lambda$modifyEntityFilteredValue$7 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
4241
net/minecraft/world/item/enchantment/Enchantment.modifyDamageProtection (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/damagesource/DamageSource;Lorg/apache/commons/lang3/mutable/MutableFloat;)V <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
4342
net/minecraft/world/entity/ExperienceOrb.repairPlayerItems (Lnet/minecraft/server/level/ServerPlayer;I)I <- net/minecraft/world/item/enchantment/EnchantmentHelper.getRandomItemWith <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
44-
net/minecraft/world/item/enchantment/EnchantmentHelper.getTridentSpinAttackStrength (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)F <- net/minecraft/world/item/enchantment/EnchantmentHelper.lambda$getTridentSpinAttackStrength$36 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
45-
net/minecraft/world/item/enchantment/EnchantmentHelper.modifyCrossbowChargingTime (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;F)F <- net/minecraft/world/item/enchantment/EnchantmentHelper.lambda$modifyCrossbowChargingTime$35 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
43+
net/minecraft/world/item/enchantment/EnchantmentHelper.getTridentSpinAttackStrength (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)F <- net/minecraft/world/item/enchantment/EnchantmentHelper.lambda$getTridentSpinAttackStrength$37 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
44+
net/minecraft/world/item/enchantment/EnchantmentHelper.modifyCrossbowChargingTime (Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;F)F <- net/minecraft/world/item/enchantment/EnchantmentHelper.lambda$modifyCrossbowChargingTime$36 <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
4645
net/minecraft/world/item/enchantment/EnchantmentHelper.processEquipmentDropChance (Lnet/minecraft/server/level/ServerLevel;Lnet/minecraft/world/entity/LivingEntity;Lnet/minecraft/world/damagesource/DamageSource;F)F <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
4746
net/minecraft/world/item/enchantment/effects/ApplyMobEffect.apply (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/enchantment/EnchantedItemInUse;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/Vec3;)V <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
4847
net/minecraft/world/item/enchantment/effects/DamageEntity.apply (Lnet/minecraft/server/level/ServerLevel;ILnet/minecraft/world/item/enchantment/EnchantedItemInUse;Lnet/minecraft/world/entity/Entity;Lnet/minecraft/world/phys/Vec3;)V <- net/minecraft/world/entity/Entity.getRandom <- net/minecraft/world/entity/Entity.random
@@ -65,6 +64,7 @@ net/minecraft/world/entity/Entity.playSwimSound (F)V <- net/minecraft/world/enti
6564
net/minecraft/world/entity/Entity.playSwimSound (F)V <- net/minecraft/world/entity/Entity.random
6665
net/minecraft/world/entity/Entity.spawnSprintParticle ()V <- net/minecraft/world/entity/Entity.random
6766
net/minecraft/world/entity/Entity.spawnSprintParticle ()V <- net/minecraft/world/entity/Entity.random
67+
net/minecraft/world/entity/LivingEntity.<init> (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/level/Level;)V <- net/minecraft/world/entity/Entity.random
6868
net/minecraft/world/entity/LivingEntity.createItemStackToDrop (Lnet/minecraft/world/item/ItemStack;ZZ)Lnet/minecraft/world/entity/item/ItemEntity; <- net/minecraft/world/entity/Entity.random
6969
net/minecraft/world/entity/LivingEntity.createItemStackToDrop (Lnet/minecraft/world/item/ItemStack;ZZ)Lnet/minecraft/world/entity/item/ItemEntity; <- net/minecraft/world/entity/Entity.random
7070
net/minecraft/world/entity/LivingEntity.createItemStackToDrop (Lnet/minecraft/world/item/ItemStack;ZZ)Lnet/minecraft/world/entity/item/ItemEntity; <- net/minecraft/world/entity/Entity.random
@@ -86,6 +86,10 @@ net/minecraft/world/entity/LivingEntity.handleEntityEvent (B)V <- net/minecraft/
8686
net/minecraft/world/entity/LivingEntity.handleEntityEvent (B)V <- net/minecraft/world/entity/Entity.random
8787
net/minecraft/world/entity/LivingEntity.handleEntityEvent (B)V <- net/minecraft/world/entity/Entity.random
8888
net/minecraft/world/entity/LivingEntity.handleEntityEvent (B)V <- net/minecraft/world/entity/Entity.random
89+
net/minecraft/world/entity/LivingEntity.knockback (DDD)V <- net/minecraft/world/entity/Entity.random
90+
net/minecraft/world/entity/LivingEntity.knockback (DDD)V <- net/minecraft/world/entity/Entity.random
91+
net/minecraft/world/entity/LivingEntity.knockback (DDD)V <- net/minecraft/world/entity/Entity.random
92+
net/minecraft/world/entity/LivingEntity.knockback (DDD)V <- net/minecraft/world/entity/Entity.random
8993
net/minecraft/world/entity/LivingEntity.handleEntityEvent (B)V <- net/minecraft/world/entity/LivingEntity.makeDrownParticles <- net/minecraft/world/entity/Entity.random
9094
net/minecraft/world/entity/LivingEntity.makePoofParticles ()V <- net/minecraft/world/entity/Entity.random
9195
net/minecraft/world/entity/LivingEntity.makePoofParticles ()V <- net/minecraft/world/entity/Entity.random

src/main/java/net/earthcomputer/clientcommands/c2c/C2CFriendlyByteBuf.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,28 @@
33
import io.netty.buffer.ByteBuf;
44
import net.minecraft.core.RegistryAccess;
55
import net.minecraft.network.RegistryFriendlyByteBuf;
6+
import org.jspecify.annotations.Nullable;
67

78
import java.util.UUID;
89

910
public class C2CFriendlyByteBuf extends RegistryFriendlyByteBuf {
11+
@Nullable
1012
private final String sender;
13+
@Nullable
1114
private final UUID senderUUID;
1215

13-
public C2CFriendlyByteBuf(ByteBuf source, RegistryAccess registryAccess, String sender, UUID senderUUID) {
16+
public C2CFriendlyByteBuf(ByteBuf source, RegistryAccess registryAccess, @Nullable String sender, @Nullable UUID senderUUID) {
1417
super(source, registryAccess);
1518
this.sender = sender;
1619
this.senderUUID = senderUUID;
1720
}
1821

22+
@Nullable
1923
public String getSender() {
2024
return this.sender;
2125
}
2226

27+
@Nullable
2328
public UUID getSenderUUID() {
2429
return this.senderUUID;
2530
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package net.earthcomputer.clientcommands.c2c;
22

33
import net.minecraft.network.protocol.Packet;
4+
import org.jspecify.annotations.Nullable;
45

56
public interface C2CPacket extends Packet<C2CPacketListener> {
7+
@Nullable
68
String sender();
79
}

0 commit comments

Comments
 (0)