-
-
Notifications
You must be signed in to change notification settings - Fork 211
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Implement creation of custom TicketTypes. (#3834)
* Implement creation of custom TicketTypes. * Missed this in last commit * Update on top of Tickets#infinite * Bump SpongeAPI --------- Co-authored-by: Chris Sanders <zidane@spongepowered.org> Co-authored-by: aromaa <me@joniaromaa.fi>
- Loading branch information
3 people
committed
May 18, 2024
1 parent
7b4e8d4
commit 6570071
Showing
14 changed files
with
192 additions
and
201 deletions.
There are no files selected for viewing
Submodule SpongeAPI
updated
4 files
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 0 additions & 35 deletions
35
src/main/java/org/spongepowered/common/bridge/world/server/TicketTypeBridge.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 0 additions & 50 deletions
50
src/main/java/org/spongepowered/common/world/server/SpongeTicketType.java
This file was deleted.
Oops, something went wrong.
86 changes: 86 additions & 0 deletions
86
src/main/java/org/spongepowered/common/world/server/SpongeTicketTypeBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * This file is part of Sponge, licensed under the MIT License (MIT). | ||
| * | ||
| * Copyright (c) SpongePowered <https://www.spongepowered.org> | ||
| * Copyright (c) contributors | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in | ||
| * all copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| * THE SOFTWARE. | ||
| */ | ||
| package org.spongepowered.common.world.server; | ||
|
|
||
| import org.checkerframework.checker.nullness.qual.MonotonicNonNull; | ||
| import org.checkerframework.checker.nullness.qual.Nullable; | ||
| import org.spongepowered.api.util.Ticks; | ||
| import org.spongepowered.api.world.server.TicketType; | ||
| import org.spongepowered.common.accessor.server.level.TicketTypeAccessor; | ||
| import org.spongepowered.common.util.Constants; | ||
|
|
||
| import java.util.Comparator; | ||
| import java.util.Objects; | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| public final class SpongeTicketTypeBuilder<T> implements TicketType.Builder<T> { | ||
|
|
||
| private @MonotonicNonNull String name; | ||
| private @Nullable Comparator<T> comparator; | ||
| private @MonotonicNonNull Ticks lifetime; | ||
|
|
||
| @Override | ||
| public TicketType.Builder<T> reset() { | ||
| this.name = null; | ||
| this.comparator = null; | ||
| this.lifetime = null; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public TicketType.Builder<T> name(final String name) { | ||
| this.name = Objects.requireNonNull(name, "Name cannot null"); | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public TicketType.Builder<T> comparator(final @Nullable Comparator<T> comparator) { | ||
| this.comparator = comparator; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public TicketType.Builder<T> lifetime(final Ticks lifetime) { | ||
| Objects.requireNonNull(lifetime, "Lifetime cannot be null"); | ||
| if (!lifetime.isInfinite() && lifetime.ticks() <= 0) { | ||
| throw new IllegalArgumentException("The lifetime is required to be a positive integer"); | ||
| } | ||
| this.lifetime = lifetime; | ||
| return this; | ||
| } | ||
|
|
||
| @Override | ||
| public TicketType<T> build() { | ||
| Objects.requireNonNull(this.name, "Name cannot null"); | ||
| Objects.requireNonNull(this.lifetime, "Lifetime cannot be null"); | ||
| if (this.comparator == null) { | ||
| this.comparator = (v1, v2) -> 0; | ||
| } | ||
|
|
||
| return (TicketType<T>) TicketTypeAccessor.accessor$createInstance(this.name, this.comparator, this.lifetime.isInfinite() | ||
| ? Constants.ChunkTicket.INFINITE_TIMEOUT | ||
| : this.lifetime.ticks()); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.