-
-
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.
Merge SpongeTicketType into TicketType
- Loading branch information
1 parent
33a9ff3
commit 009baa0
Showing
11 changed files
with
182 additions
and
32 deletions.
There are no files selected for viewing
Submodule SpongeAPI
updated
1 files
| +1 −1 | src/main/java/org/spongepowered/api/registry/RegistryTypes.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
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: 35 additions & 0 deletions
35
src/main/java/org/spongepowered/common/bridge/world/server/TicketTypeBridge.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,35 @@ | ||
| /* | ||
| * 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.bridge.world.server; | ||
|
|
||
| import java.util.function.Function; | ||
|
|
||
| public interface TicketTypeBridge<N, T> { | ||
|
|
||
| void bridge$setTypeConverter(Function<T, N> converter); | ||
|
|
||
| N bridge$convertToNativeType(T spongeType); | ||
|
|
||
| } |
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
45 changes: 45 additions & 0 deletions
45
src/mixins/java/org/spongepowered/common/mixin/api/mcp/world/server/TicketTypeMixin_API.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,45 @@ | ||
| /* | ||
| * 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.mixin.api.mcp.world.server; | ||
|
|
||
| import org.spongepowered.api.util.Ticks; | ||
| import org.spongepowered.api.world.server.TicketType; | ||
| import org.spongepowered.asm.mixin.Final; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.asm.mixin.Shadow; | ||
|
|
||
| @Mixin(net.minecraft.world.server.TicketType.class) | ||
| public abstract class TicketTypeMixin_API<T> implements TicketType<T> { | ||
|
|
||
| // @formatter:off | ||
| @Shadow @Final private long timeout; | ||
| // @formatter:on | ||
|
|
||
| @Override | ||
| public Ticks getLifetime() { | ||
| return Ticks.of(this.timeout); | ||
| } | ||
|
|
||
| } |
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
72 changes: 72 additions & 0 deletions
72
src/mixins/java/org/spongepowered/common/mixin/core/world/server/TicketTypeMixin.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,72 @@ | ||
| /* | ||
| * 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.mixin.core.world.server; | ||
|
|
||
| import net.minecraft.util.Unit; | ||
| import net.minecraft.util.math.BlockPos; | ||
| import net.minecraft.util.math.ChunkPos; | ||
| import net.minecraft.world.server.TicketType; | ||
| import org.spongepowered.asm.mixin.Mixin; | ||
| import org.spongepowered.common.bridge.world.server.TicketTypeBridge; | ||
| import org.spongepowered.common.util.VecHelper; | ||
| import org.spongepowered.math.vector.Vector3i; | ||
|
|
||
| import java.util.function.Function; | ||
|
|
||
| @Mixin(TicketType.class) | ||
| public abstract class TicketTypeMixin<N, T> implements TicketTypeBridge<N, T> { | ||
|
|
||
| private Function<T, N> impl$spongeToNativeType; | ||
|
|
||
| public void bridge$setTypeConverter(final Function<T, N> converter) { | ||
| this.impl$spongeToNativeType = converter; | ||
| } | ||
|
|
||
| @SuppressWarnings({"unchecked", "ConstantConditions", "rawtypes"}) | ||
| @Override | ||
| public N bridge$convertToNativeType(final T spongeType) { | ||
| // I hate myself for even doing this, but hey ho. | ||
| // The intention is that people will only use Sponge registered tickets. | ||
| // If a mod provides a ticket and a plugin wants to use them, it'll have | ||
| // to use the correct type. | ||
| if (this.impl$spongeToNativeType == null) { | ||
| final TicketType<N> thisType = (TicketType<N>) (Object) this; | ||
| if (thisType == TicketType.POST_TELEPORT) { | ||
| this.impl$spongeToNativeType = (Function) entity -> ((net.minecraft.entity.Entity) entity).getId(); | ||
| } else if (thisType == TicketType.START || thisType == TicketType.DRAGON) { | ||
| this.impl$spongeToNativeType = (Function) notUsed -> Unit.INSTANCE; | ||
| } else if (thisType == TicketType.FORCED || thisType == TicketType.LIGHT || thisType == TicketType.PLAYER || | ||
| thisType == TicketType.UNKNOWN) { | ||
| this.impl$spongeToNativeType = (Function) (Function<Vector3i, ChunkPos>) (VecHelper::toChunkPos); | ||
| } else if (thisType == TicketType.PORTAL) { | ||
| this.impl$spongeToNativeType = (Function) (Function<Vector3i, BlockPos>) (VecHelper::toBlockPos); | ||
| } else { | ||
| this.impl$spongeToNativeType = t -> (N) t; | ||
| } | ||
| } | ||
| return this.impl$spongeToNativeType.apply(spongeType); | ||
| } | ||
|
|
||
| } |
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