diff --git a/shared/src/main/java/net/blay09/mods/waystones/api/IMutableWaystone.java b/shared/src/main/java/net/blay09/mods/waystones/api/IMutableWaystone.java index c40b94b5..51c58668 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/api/IMutableWaystone.java +++ b/shared/src/main/java/net/blay09/mods/waystones/api/IMutableWaystone.java @@ -9,12 +9,6 @@ public interface IMutableWaystone { void setName(String name); - /** - * @deprecated Use {@link #setVisibility(WaystoneVisibility)} instead. - */ - @Deprecated(forRemoval = true) - void setGlobal(boolean global); - void setVisibility(WaystoneVisibility visibility); void setDimension(ResourceKey dimension); diff --git a/shared/src/main/java/net/blay09/mods/waystones/api/IWaystone.java b/shared/src/main/java/net/blay09/mods/waystones/api/IWaystone.java index 2ff389ee..82846cc0 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/api/IWaystone.java +++ b/shared/src/main/java/net/blay09/mods/waystones/api/IWaystone.java @@ -7,7 +7,6 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.player.Player; import net.minecraft.world.level.Level; -import net.minecraft.world.phys.Vec3; import org.jetbrains.annotations.Nullable; import java.util.UUID; @@ -25,12 +24,6 @@ default boolean wasGenerated() { WaystoneOrigin getOrigin(); - /** - * @deprecated Use {@link #getVisibility()} instead. - */ - @Deprecated(forRemoval = true) - boolean isGlobal(); - boolean isOwner(Player player); BlockPos getPos(); diff --git a/shared/src/main/java/net/blay09/mods/waystones/api/IWaystoneTeleportContext.java b/shared/src/main/java/net/blay09/mods/waystones/api/IWaystoneTeleportContext.java index ec819873..4f76f52d 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/api/IWaystoneTeleportContext.java +++ b/shared/src/main/java/net/blay09/mods/waystones/api/IWaystoneTeleportContext.java @@ -33,12 +33,6 @@ public interface IWaystoneTeleportContext { boolean isDimensionalTeleport(); - @Deprecated(forRemoval = true) - int getXpCost(); - - @Deprecated(forRemoval = true) - void setXpCost(int xpCost); - ExperienceCost getExperienceCost(); void setExperienceCost(ExperienceCost experienceCost); diff --git a/shared/src/main/java/net/blay09/mods/waystones/api/KnownWaystonesEvent.java b/shared/src/main/java/net/blay09/mods/waystones/api/KnownWaystonesEvent.java deleted file mode 100644 index 8f94ce18..00000000 --- a/shared/src/main/java/net/blay09/mods/waystones/api/KnownWaystonesEvent.java +++ /dev/null @@ -1,24 +0,0 @@ -package net.blay09.mods.waystones.api; - -import net.blay09.mods.balm.api.event.BalmEvent; - -import java.util.List; - -/** - * This event is fired on the client side when the client has received the known waystones of the player. - * - * @deprecated Use {@link WaystonesListReceivedEvent} instead. - */ -@Deprecated -public class KnownWaystonesEvent extends BalmEvent { - - private final List waystones; - - public KnownWaystonesEvent(List waystones) { - this.waystones = waystones; - } - - public List getWaystones() { - return waystones; - } -} diff --git a/shared/src/main/java/net/blay09/mods/waystones/api/WaystoneTeleportEvent.java b/shared/src/main/java/net/blay09/mods/waystones/api/WaystoneTeleportEvent.java index 724e5c82..56ea9199 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/api/WaystoneTeleportEvent.java +++ b/shared/src/main/java/net/blay09/mods/waystones/api/WaystoneTeleportEvent.java @@ -31,16 +31,6 @@ public void setExperienceCost(ExperienceCost experienceCost) { context.setExperienceCost(experienceCost); } - @Deprecated - public int getXpCost() { - return context.getXpCost(); - } - - @Deprecated - public void setXpCost(int xpCost) { - context.setXpCost(xpCost); - } - public int getCooldown() { return context.getCooldown(); } diff --git a/shared/src/main/java/net/blay09/mods/waystones/api/WaystonesAPI.java b/shared/src/main/java/net/blay09/mods/waystones/api/WaystonesAPI.java index 4a416fd0..eb0d2e95 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/api/WaystonesAPI.java +++ b/shared/src/main/java/net/blay09/mods/waystones/api/WaystonesAPI.java @@ -2,7 +2,6 @@ import com.mojang.datafixers.util.Either; import net.blay09.mods.waystones.core.WarpMode; -import net.blay09.mods.waystones.core.WaystoneTeleportContext; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.Entity; @@ -36,14 +35,6 @@ public static Either, WaystoneTeleportError> tryTeleport(IWaystoneT return __internalMethods.tryTeleport(context); } - /** - * @deprecated Use {@link #tryTeleport(IWaystoneTeleportContext)} instead. - */ - @Deprecated - public static Either, WaystoneTeleportError> tryTeleport(WaystoneTeleportContext context) { - return __internalMethods.tryTeleport(context); - } - public static Either, WaystoneTeleportError> forceTeleportToWaystone(Entity entity, IWaystone waystone) { return __internalMethods.forceTeleportToWaystone(entity, waystone); } @@ -52,14 +43,6 @@ public static List forceTeleport(IWaystoneTeleportContext context) { return __internalMethods.forceTeleport(context); } - /** - * @deprecated Use {@link #forceTeleport(IWaystoneTeleportContext)} instead. - */ - @Deprecated - public static List forceTeleport(WaystoneTeleportContext context) { - return __internalMethods.forceTeleport(context); - } - public static Optional getWaystoneAt(ServerLevel level, BlockPos pos) { return __internalMethods.getWaystoneAt(level, pos); } diff --git a/shared/src/main/java/net/blay09/mods/waystones/block/WarpPlateBlock.java b/shared/src/main/java/net/blay09/mods/waystones/block/WarpPlateBlock.java index 7f5f879b..fd1ff1b7 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/block/WarpPlateBlock.java +++ b/shared/src/main/java/net/blay09/mods/waystones/block/WarpPlateBlock.java @@ -66,15 +66,12 @@ public String getSerializedName() { box(3.0, 1.0, 3.0, 13.0, 2.0, 13.0) ).optimize(); - @Deprecated - public static final BooleanProperty ACTIVE = BooleanProperty.create("active"); public static final EnumProperty STATUS = EnumProperty.create("status", WarpPlateStatus.class); public WarpPlateBlock(Properties properties) { super(properties); registerDefaultState(this.stateDefinition.any() .setValue(WATERLOGGED, false) - .setValue(ACTIVE, false) .setValue(STATUS, WarpPlateStatus.IDLE)); } @@ -103,7 +100,6 @@ public VoxelShape getShape(BlockState blockState, BlockGetter blockGetter, Block @Override protected void createBlockStateDefinition(StateDefinition.Builder builder) { super.createBlockStateDefinition(builder); - builder.add(ACTIVE); builder.add(STATUS); } diff --git a/shared/src/main/java/net/blay09/mods/waystones/block/entity/WarpPlateBlockEntity.java b/shared/src/main/java/net/blay09/mods/waystones/block/entity/WarpPlateBlockEntity.java index b275c7e6..b13abb35 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/block/entity/WarpPlateBlockEntity.java +++ b/shared/src/main/java/net/blay09/mods/waystones/block/entity/WarpPlateBlockEntity.java @@ -131,7 +131,6 @@ public void onEntityCollision(Entity entity) { .map(it -> !(entity instanceof Player player) || player.getAbilities().instabuild || it.canAfford(player)) .orElse(true); level.setBlock(worldPosition, getBlockState() - .setValue(WarpPlateBlock.ACTIVE, true) .setValue(WarpPlateBlock.STATUS, canAfford ? status : WarpPlateBlock.WarpPlateStatus.INVALID), 3); } } @@ -156,7 +155,6 @@ public void serverTick() { List entities = level.getEntities((Entity) null, boundsAbove, EntitySelector.ENTITY_STILL_ALIVE); if (entities.isEmpty()) { level.setBlock(worldPosition, getBlockState() - .setValue(WarpPlateBlock.ACTIVE, false) .setValue(WarpPlateBlock.STATUS, WarpPlateBlock.WarpPlateStatus.IDLE), 3); ticksPassedPerEntity.clear(); } diff --git a/shared/src/main/java/net/blay09/mods/waystones/core/InvalidWaystone.java b/shared/src/main/java/net/blay09/mods/waystones/core/InvalidWaystone.java index 8a6a44ca..9ea2fed4 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/core/InvalidWaystone.java +++ b/shared/src/main/java/net/blay09/mods/waystones/core/InvalidWaystone.java @@ -48,11 +48,6 @@ public WaystoneOrigin getOrigin() { return WaystoneOrigin.UNKNOWN; } - @Override - public boolean isGlobal() { - return false; - } - @Override public WaystoneVisibility getVisibility() { return WaystoneVisibility.ACTIVATION; diff --git a/shared/src/main/java/net/blay09/mods/waystones/core/WarpMode.java b/shared/src/main/java/net/blay09/mods/waystones/core/WarpMode.java index b87f2c73..9de0f440 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/core/WarpMode.java +++ b/shared/src/main/java/net/blay09/mods/waystones/core/WarpMode.java @@ -1,13 +1,8 @@ package net.blay09.mods.waystones.core; -import net.blay09.mods.waystones.api.IWaystone; import net.blay09.mods.waystones.api.IWaystoneTeleportContext; -import net.blay09.mods.waystones.api.WaystoneTypes; import net.blay09.mods.waystones.config.WaystonesConfig; -import net.minecraft.world.entity.Entity; -import net.minecraft.world.entity.player.Player; -import java.util.function.BiPredicate; import java.util.function.Supplier; /** @@ -15,25 +10,23 @@ */ @Deprecated(forRemoval = true) public enum WarpMode { - INVENTORY_BUTTON(() -> WaystonesConfig.getActive().xpCost.inventoryButtonXpCostMultiplier, WarpMode::always, false), - WARP_SCROLL(() -> 0.0, WarpMode::always, true), - RETURN_SCROLL(() -> 0.0, WarpMode::always, true), - WARP_STONE(() -> WaystonesConfig.getActive().xpCost.warpStoneXpCostMultiplier, WarpMode::always, false), - WAYSTONE_TO_WAYSTONE(() -> WaystonesConfig.getActive().xpCost.waystoneXpCostMultiplier, WarpMode::always, false), - SHARESTONE_TO_SHARESTONE(() -> WaystonesConfig.getActive().xpCost.sharestoneXpCostMultiplier, WarpMode::always, false), - WARP_PLATE(() -> WaystonesConfig.getActive().xpCost.warpPlateXpCostMultiplier, WarpMode::always, false), - PORTSTONE_TO_WAYSTONE(() -> WaystonesConfig.getActive().xpCost.portstoneXpCostMultiplier, WarpMode::always, false), - CUSTOM(() -> 0.0, WarpMode::always, false); + INVENTORY_BUTTON(() -> WaystonesConfig.getActive().xpCost.inventoryButtonXpCostMultiplier, false), + WARP_SCROLL(() -> 0.0, true), + RETURN_SCROLL(() -> 0.0, true), + WARP_STONE(() -> WaystonesConfig.getActive().xpCost.warpStoneXpCostMultiplier, false), + WAYSTONE_TO_WAYSTONE(() -> WaystonesConfig.getActive().xpCost.waystoneXpCostMultiplier, false), + SHARESTONE_TO_SHARESTONE(() -> WaystonesConfig.getActive().xpCost.sharestoneXpCostMultiplier, false), + WARP_PLATE(() -> WaystonesConfig.getActive().xpCost.warpPlateXpCostMultiplier, false), + PORTSTONE_TO_WAYSTONE(() -> WaystonesConfig.getActive().xpCost.portstoneXpCostMultiplier, false), + CUSTOM(() -> 0.0, false); public static WarpMode[] values = values(); private final Supplier xpCostMultiplierSupplier; - private final BiPredicate allowTeleportPredicate; private final boolean consumesItem; - WarpMode(Supplier xpCostMultiplierSupplier, BiPredicate allowTeleportPredicate, boolean consumesItem) { + WarpMode(Supplier xpCostMultiplierSupplier, boolean consumesItem) { this.xpCostMultiplierSupplier = xpCostMultiplierSupplier; - this.allowTeleportPredicate = allowTeleportPredicate; this.consumesItem = consumesItem; } @@ -49,33 +42,4 @@ public boolean consumesItem() { return consumesItem; } - private static boolean always(Entity player, IWaystone waystone) { - return true; - } - - private static boolean waystoneIsActivatedOrNamed(Entity player, IWaystone waystone) { - return WaystonesConfig.getActive().getInventoryButtonMode().hasNamedTarget() || (waystone.getWaystoneType() - .equals(WaystoneTypes.WAYSTONE) && player instanceof Player && PlayerWaystoneManager.isWaystoneActivated(((Player) player), waystone)); - } - - private static boolean waystoneIsActivated(Entity player, IWaystone waystone) { - return waystone.getWaystoneType() - .equals(WaystoneTypes.WAYSTONE) && player instanceof Player && PlayerWaystoneManager.isWaystoneActivated(((Player) player), waystone); - } - - private static boolean sharestonesOnly(Entity player, IWaystone waystone) { - return WaystoneTypes.isSharestone(waystone.getWaystoneType()); - } - - private static boolean warpPlatesOnly(Entity player, IWaystone waystone) { - return waystone.getWaystoneType().equals(WaystoneTypes.WARP_PLATE); - } - - /** - * @deprecated Validation now happens earlier during packet handling. This will always resolve to true. - */ - @Deprecated(forRemoval = true) - public BiPredicate getAllowTeleportPredicate() { - return allowTeleportPredicate; - } } diff --git a/shared/src/main/java/net/blay09/mods/waystones/core/Waystone.java b/shared/src/main/java/net/blay09/mods/waystones/core/Waystone.java index f60b60b9..2eed2687 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/core/Waystone.java +++ b/shared/src/main/java/net/blay09/mods/waystones/core/Waystone.java @@ -80,16 +80,6 @@ public WaystoneOrigin getOrigin() { return origin; } - @Override - public boolean isGlobal() { - return visibility == WaystoneVisibility.GLOBAL; - } - - @Override - public void setGlobal(boolean global) { - visibility = global ? WaystoneVisibility.GLOBAL : WaystoneVisibility.ACTIVATION; - } - @Override public WaystoneVisibility getVisibility() { return visibility; diff --git a/shared/src/main/java/net/blay09/mods/waystones/core/WaystoneProxy.java b/shared/src/main/java/net/blay09/mods/waystones/core/WaystoneProxy.java index b696a2cc..04bd3c53 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/core/WaystoneProxy.java +++ b/shared/src/main/java/net/blay09/mods/waystones/core/WaystoneProxy.java @@ -76,11 +76,6 @@ public WaystoneOrigin getOrigin() { return getBackingWaystone().getOrigin(); } - @Override - public boolean isGlobal() { - return getBackingWaystone().isGlobal(); - } - @Override public boolean isOwner(Player player) { return getBackingWaystone().isOwner(player); @@ -104,14 +99,6 @@ public void setName(String name) { } } - @Override - public void setGlobal(boolean global) { - IWaystone backingWaystone = getBackingWaystone(); - if (backingWaystone instanceof IMutableWaystone) { - ((IMutableWaystone) backingWaystone).setGlobal(global); - } - } - @Override public void setDimension(ResourceKey dimension) { IWaystone backingWaystone = getBackingWaystone(); diff --git a/shared/src/main/java/net/blay09/mods/waystones/core/WaystoneTeleportContext.java b/shared/src/main/java/net/blay09/mods/waystones/core/WaystoneTeleportContext.java index cbc0719e..75c214e4 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/core/WaystoneTeleportContext.java +++ b/shared/src/main/java/net/blay09/mods/waystones/core/WaystoneTeleportContext.java @@ -101,19 +101,6 @@ public boolean isDimensionalTeleport() { return targetWaystone.getDimension() != entity.level().dimension(); } - @Override - public int getXpCost() { - if (entity instanceof Player player) { - return xpCost.getCostAsLevels(player); - } - return 0; - } - - @Override - public void setXpCost(int xpCost) { - this.xpCost = ExperienceCost.fromLevels(xpCost); - } - @Override public ExperienceCost getExperienceCost() { return xpCost; diff --git a/shared/src/main/java/net/blay09/mods/waystones/core/WaystoneTypes.java b/shared/src/main/java/net/blay09/mods/waystones/core/WaystoneTypes.java deleted file mode 100644 index 17b228ec..00000000 --- a/shared/src/main/java/net/blay09/mods/waystones/core/WaystoneTypes.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.blay09.mods.waystones.core; - -import net.blay09.mods.waystones.Waystones; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.DyeColor; -import org.jetbrains.annotations.Nullable; - -/* - * @deprecated Use {@link net.blay09.mods.waystones.api.WaystoneTypes} instead. - */ -@Deprecated -public class WaystoneTypes { - public static final ResourceLocation WAYSTONE = new ResourceLocation(Waystones.MOD_ID, "waystone"); - public static final ResourceLocation WARP_PLATE = new ResourceLocation(Waystones.MOD_ID, "warp_plate"); - public static final ResourceLocation PORTSTONE = new ResourceLocation(Waystones.MOD_ID, "portstone"); - - private static final ResourceLocation SHARESTONE = new ResourceLocation(Waystones.MOD_ID, "sharestone"); - - public static ResourceLocation getSharestone(@Nullable DyeColor color) { - if (color == null) { - return SHARESTONE; - } - - return new ResourceLocation(Waystones.MOD_ID, color.getSerializedName() + "_sharestone"); - } - - public static boolean isSharestone(ResourceLocation waystoneType) { - return waystoneType.equals(SHARESTONE) || waystoneType.getPath().endsWith("_sharestone"); - } -} diff --git a/shared/src/main/java/net/blay09/mods/waystones/network/message/KnownWaystonesMessage.java b/shared/src/main/java/net/blay09/mods/waystones/network/message/KnownWaystonesMessage.java index 2d620630..e3c951bb 100644 --- a/shared/src/main/java/net/blay09/mods/waystones/network/message/KnownWaystonesMessage.java +++ b/shared/src/main/java/net/blay09/mods/waystones/network/message/KnownWaystonesMessage.java @@ -3,7 +3,6 @@ import net.blay09.mods.balm.api.Balm; import net.blay09.mods.balm.api.BalmEnvironment; import net.blay09.mods.waystones.api.IWaystone; -import net.blay09.mods.waystones.api.KnownWaystonesEvent; import net.blay09.mods.waystones.api.WaystonesListReceivedEvent; import net.blay09.mods.waystones.api.WaystoneTypes; import net.blay09.mods.waystones.core.*; @@ -48,8 +47,6 @@ public static void handle(Player player, KnownWaystonesMessage message) { if (message.type.equals(WaystoneTypes.WAYSTONE)) { InMemoryPlayerWaystoneData playerWaystoneData = (InMemoryPlayerWaystoneData) PlayerWaystoneManager.getPlayerWaystoneData(BalmEnvironment.CLIENT); playerWaystoneData.setWaystones(message.waystones); - - Balm.getEvents().fireEvent(new KnownWaystonesEvent(waystones)); } Balm.getEvents().fireEvent(new WaystonesListReceivedEvent(message.type, waystones));