Skip to content

Commit c643f5e

Browse files
Doc94Doc94
committed
Rename the lynx
1 parent 5af3de2 commit c643f5e

25 files changed

+106
-101
lines changed

‎paper-server/src/main/java/io/papermc/paper/datacomponent/item/PaperBlocksAttacks.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.bukkit.damage.DamageType;
1616
import org.jspecify.annotations.Nullable;
1717

18-
import static io.papermc.paper.registry.data.util.Checks.asArgumentNonNegative;
18+
import static io.papermc.paper.registry.data.util.Checks.requireArgumentNonNegative;
1919

2020
public record PaperBlocksAttacks(
2121
net.minecraft.world.item.component.BlocksAttacks impl
@@ -74,13 +74,13 @@ static final class BuilderImpl implements Builder {
7474

7575
@Override
7676
public Builder blockDelaySeconds(final float delay) {
77-
this.blockDelaySeconds = asArgumentNonNegative(delay, "delay");
77+
this.blockDelaySeconds = requireArgumentNonNegative(delay, "delay");
7878
return this;
7979
}
8080

8181
@Override
8282
public Builder disableCooldownScale(final float scale) {
83-
this.disableCooldownScale = asArgumentNonNegative(scale, "scale");
83+
this.disableCooldownScale = requireArgumentNonNegative(scale, "scale");
8484
return this;
8585
}
8686

‎paper-server/src/main/java/io/papermc/paper/datacomponent/item/PaperConsumable.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import org.checkerframework.checker.index.qual.NonNegative;
1616
import org.jetbrains.annotations.Unmodifiable;
1717

18-
import static io.papermc.paper.registry.data.util.Checks.asArgumentNonNegative;
18+
import static io.papermc.paper.registry.data.util.Checks.requireArgumentNonNegative;
1919

2020
public record PaperConsumable(
2121
net.minecraft.world.item.component.Consumable impl
@@ -74,7 +74,7 @@ static final class BuilderImpl implements Builder {
7474

7575
@Override
7676
public Builder consumeSeconds(final @NonNegative float consumeSeconds) {
77-
this.consumeSeconds = asArgumentNonNegative(consumeSeconds, "consumeSeconds");
77+
this.consumeSeconds = requireArgumentNonNegative(consumeSeconds, "consumeSeconds");
7878
return this;
7979
}
8080

‎paper-server/src/main/java/io/papermc/paper/datacomponent/item/PaperItemTool.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.papermc.paper.datacomponent.item;
22

33
import io.papermc.paper.registry.RegistryKey;
4+
import io.papermc.paper.registry.data.util.Checks;
45
import io.papermc.paper.registry.data.util.Conversions;
56
import io.papermc.paper.registry.set.PaperRegistrySets;
67
import io.papermc.paper.registry.set.RegistryKeySet;
@@ -16,8 +17,8 @@
1617
import org.jetbrains.annotations.Unmodifiable;
1718
import org.jspecify.annotations.Nullable;
1819

19-
import static io.papermc.paper.registry.data.util.Checks.asArgumentNonNegative;
20-
import static io.papermc.paper.registry.data.util.Checks.asArgumentPositive;
20+
import static io.papermc.paper.registry.data.util.Checks.requireArgumentNonNegative;
21+
import static io.papermc.paper.registry.data.util.Checks.requireArgumentPositive;
2122

2223
public record PaperItemTool(
2324
net.minecraft.world.item.component.Tool impl
@@ -59,7 +60,7 @@ public boolean canDestroyBlocksInCreative() {
5960
record PaperRule(RegistryKeySet<BlockType> blocks, @Nullable Float speed, TriState correctForDrops) implements Rule {
6061

6162
public static PaperRule fromUnsafe(final RegistryKeySet<BlockType> blocks, final @Nullable Float speed, final TriState correctForDrops) {
62-
return new PaperRule(blocks, (speed == null) ? null : asArgumentPositive(speed, "speed"), correctForDrops);
63+
return new PaperRule(blocks, (speed == null) ? null : requireArgumentPositive(speed, "speed"), correctForDrops);
6364
}
6465
}
6566

@@ -72,7 +73,7 @@ static final class BuilderImpl implements Builder {
7273

7374
@Override
7475
public Builder damagePerBlock(final int damage) {
75-
this.damage = asArgumentNonNegative(damage, "damage");
76+
this.damage = Checks.requireArgumentNonNegative(damage, "damage");
7677
return this;
7778
}
7879

‎paper-server/src/main/java/io/papermc/paper/datacomponent/item/PaperUseCooldown.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import org.bukkit.craftbukkit.util.Handleable;
88
import org.jspecify.annotations.Nullable;
99

10-
import static io.papermc.paper.registry.data.util.Checks.asArgumentPositive;
10+
import static io.papermc.paper.registry.data.util.Checks.requireArgumentPositive;
1111

1212
public record PaperUseCooldown(
1313
net.minecraft.world.item.component.UseCooldown impl
@@ -36,7 +36,7 @@ static final class BuilderImpl implements Builder {
3636
private Optional<ResourceLocation> cooldownGroup = Optional.empty();
3737

3838
BuilderImpl(final float seconds) {
39-
this.seconds = asArgumentPositive(seconds, "seconds");
39+
this.seconds = requireArgumentPositive(seconds, "seconds");
4040
}
4141

4242
@Override

‎paper-server/src/main/java/io/papermc/paper/datacomponent/item/PaperWeapon.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package io.papermc.paper.datacomponent.item;
22

3+
import io.papermc.paper.registry.data.util.Checks;
34
import org.bukkit.craftbukkit.util.Handleable;
45

5-
import static io.papermc.paper.registry.data.util.Checks.asArgumentNonNegative;
6+
import static io.papermc.paper.registry.data.util.Checks.requireArgumentNonNegative;
67

78
public record PaperWeapon(
89
net.minecraft.world.item.component.Weapon impl
@@ -30,13 +31,13 @@ static final class BuilderImpl implements Builder {
3031

3132
@Override
3233
public Builder itemDamagePerAttack(final int damage) {
33-
this.itemDamagePerAttack = asArgumentNonNegative(damage, "damage");
34+
this.itemDamagePerAttack = Checks.requireArgumentNonNegative(damage, "damage");
3435
return this;
3536
}
3637

3738
@Override
3839
public Builder disableBlockingForSeconds(final float seconds) {
39-
this.disableBlockingForSeconds = asArgumentNonNegative(seconds, "seconds");
40+
this.disableBlockingForSeconds = requireArgumentNonNegative(seconds, "seconds");
4041
return this;
4142
}
4243

‎paper-server/src/main/java/io/papermc/paper/datacomponent/item/blocksattacks/PaperDamageReduction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import org.checkerframework.checker.index.qual.Positive;
1212
import org.jspecify.annotations.Nullable;
1313

14-
import static io.papermc.paper.registry.data.util.Checks.asArgumentPositive;
14+
import static io.papermc.paper.registry.data.util.Checks.requireArgumentPositive;
1515

1616
public record PaperDamageReduction(
1717
net.minecraft.world.item.component.BlocksAttacks.DamageReduction internal
@@ -53,7 +53,7 @@ public Builder type(final @Nullable RegistryKeySet<DamageType> type) {
5353

5454
@Override
5555
public Builder horizontalBlockingAngle(final @Positive float horizontalBlockingAngle) {
56-
this.horizontalBlockingAngle = asArgumentPositive(horizontalBlockingAngle, "horizontalBlockingAngle");
56+
this.horizontalBlockingAngle = requireArgumentPositive(horizontalBlockingAngle, "horizontalBlockingAngle");
5757
return this;
5858
}
5959

‎paper-server/src/main/java/io/papermc/paper/datacomponent/item/blocksattacks/PaperItemDamageFunction.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import net.minecraft.world.item.component.BlocksAttacks;
44
import org.checkerframework.checker.index.qual.NonNegative;
55

6-
import static io.papermc.paper.registry.data.util.Checks.asArgumentNonNegative;
6+
import static io.papermc.paper.registry.data.util.Checks.requireArgumentNonNegative;
77

88
public record PaperItemDamageFunction(
99
net.minecraft.world.item.component.BlocksAttacks.ItemDamageFunction internal
@@ -37,7 +37,7 @@ static final class BuilderImpl implements Builder {
3737

3838
@Override
3939
public Builder threshold(final @NonNegative float threshold) {
40-
this.threshold = asArgumentNonNegative(threshold, "threshold");
40+
this.threshold = requireArgumentNonNegative(threshold, "threshold");
4141
return this;
4242
}
4343

‎paper-server/src/main/java/io/papermc/paper/datacomponent/item/consumable/ConsumableTypesBridgeImpl.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
import org.bukkit.potion.PotionEffectType;
1515
import org.jspecify.annotations.NullMarked;
1616

17-
import static io.papermc.paper.registry.data.util.Checks.asArgumentMinInclusive;
18-
import static io.papermc.paper.registry.data.util.Checks.asArgumentPositive;
17+
import static io.papermc.paper.registry.data.util.Checks.requireArgumentMinInclusive;
18+
import static io.papermc.paper.registry.data.util.Checks.requireArgumentPositive;
1919

2020
@NullMarked
2121
public class ConsumableTypesBridgeImpl implements ConsumableTypesBridge {
@@ -25,7 +25,7 @@ public ConsumeEffect.ApplyStatusEffects applyStatusEffects(final List<PotionEffe
2525
return new PaperApplyStatusEffects(
2626
new net.minecraft.world.item.consume_effects.ApplyStatusEffectsConsumeEffect(
2727
new ArrayList<>(Lists.transform(effectList, CraftPotionUtil::fromBukkit)),
28-
asArgumentMinInclusive(probability, "probability", 0.0F, 1.0F)
28+
requireArgumentMinInclusive(probability, "probability", 0.0F, 1.0F)
2929
)
3030
);
3131
}
@@ -54,7 +54,7 @@ public ConsumeEffect.PlaySound playSoundEffect(final Key sound) {
5454
@Override
5555
public ConsumeEffect.TeleportRandomly teleportRandomlyEffect(final float diameter) {
5656
return new PaperTeleportRandomly(
57-
new net.minecraft.world.item.consume_effects.TeleportRandomlyConsumeEffect(asArgumentPositive(diameter, "diameter"))
57+
new net.minecraft.world.item.consume_effects.TeleportRandomlyConsumeEffect(requireArgumentPositive(diameter, "diameter"))
5858
);
5959
}
6060
}

‎paper-server/src/main/java/io/papermc/paper/registry/data/PaperBannerPatternRegistryEntry.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ public PaperBuilder(final Conversions conversions, final @Nullable BannerPattern
4444

4545
@Override
4646
public Builder assetId(final Key assetId) {
47-
this.assetId = PaperAdventure.asVanilla(asArgument(assetId, "assetId"));
47+
this.assetId = PaperAdventure.asVanilla(requireArgument(assetId, "assetId"));
4848
return this;
4949
}
5050

5151
@Override
5252
public Builder translationKey(final String translationKey) {
53-
this.translationKey = asArgument(translationKey, "translationKey");
53+
this.translationKey = requireArgument(translationKey, "translationKey");
5454
return this;
5555
}
5656

‎paper-server/src/main/java/io/papermc/paper/registry/data/PaperCatTypeRegistryEntry.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import org.bukkit.entity.Cat;
1010
import org.jspecify.annotations.Nullable;
1111

12-
import static io.papermc.paper.registry.data.util.Checks.asArgument;
12+
import static io.papermc.paper.registry.data.util.Checks.requireArgument;
1313
import static io.papermc.paper.registry.data.util.Checks.asConfigured;
1414

1515
public class PaperCatTypeRegistryEntry implements CatTypeRegistryEntry {
@@ -46,7 +46,7 @@ public PaperBuilder(final Conversions conversions, final @Nullable CatVariant in
4646

4747
@Override
4848
public Builder clientTextureAsset(final ClientTextureAsset clientTextureAsset) {
49-
this.clientTextureAsset = this.conversions.asVanilla(asArgument(clientTextureAsset, "clientTextureAsset"));
49+
this.clientTextureAsset = this.conversions.asVanilla(requireArgument(clientTextureAsset, "clientTextureAsset"));
5050
return this;
5151
}
5252

0 commit comments

Comments
 (0)