NotEvil/TiedUp-
4
2
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

vary room theme weights — sculk rare, inferno/ice uncommon

Browse Source
This commit is contained in:
NotEvil
2026-04-16 15:53:36 +02:00
parent cc8adfe015
commit fe36a1a47e
44 changed files with 117 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/tiedup/remake/network/NetworkEventHandler.java
View File

@@ -289,7 +289,7 @@ public class NetworkEventHandler {
// Resolve the dimension
ResourceKey<Level> dimKey = ResourceKey.create(
net.minecraft.core.registries.Registries.DIMENSION,
new ResourceLocation(dimStr)
ResourceLocation.parse(dimStr)
);
var server = player.getServer();

4
src/main/java/com/tiedup/remake/network/action/PacketForceFeeding.java
View File

@@ -37,11 +37,11 @@ public class PacketForceFeeding extends AbstractProgressPacketWithRole {
@Override
protected Function<PlayerBindState, PlayerStateTask> getTaskGetter() {
return PlayerBindState::getClientFeedingTask;
return state -> state.tasks().getClientFeedingTask();
}
@Override
protected BiConsumer<PlayerBindState, PlayerStateTask> getTaskSetter() {
return PlayerBindState::setClientFeedingTask;
return (state, task) -> state.tasks().setClientFeedingTask(task);
}
}

2
src/main/java/com/tiedup/remake/network/action/PacketStruggle.java
View File

@@ -93,6 +93,6 @@ public class PacketStruggle {
}
// Call struggle
state.struggle();
state.getStruggle().struggle();
}
}

4
src/main/java/com/tiedup/remake/network/action/PacketTying.java
View File

@@ -48,11 +48,11 @@ public class PacketTying extends AbstractProgressPacketWithRole {
@Override
protected Function<PlayerBindState, PlayerStateTask> getTaskGetter() {
return PlayerBindState::getClientTyingTask;
return state -> state.tasks().getClientTyingTask();
}
@Override
protected BiConsumer<PlayerBindState, PlayerStateTask> getTaskSetter() {
return PlayerBindState::setClientTyingTask;
return (state, task) -> state.tasks().setClientTyingTask(task);
}
}

4
src/main/java/com/tiedup/remake/network/action/PacketUntying.java
View File

@@ -48,11 +48,11 @@ public class PacketUntying extends AbstractProgressPacketWithRole {
@Override
protected Function<PlayerBindState, PlayerStateTask> getTaskGetter() {
return PlayerBindState::getClientUntyingTask;
return state -> state.tasks().getClientUntyingTask();
}
@Override
protected BiConsumer<PlayerBindState, PlayerStateTask> getTaskSetter() {
return PlayerBindState::setClientUntyingTask;
return (state, task) -> state.tasks().setClientUntyingTask(task);
}
}

10
src/main/java/com/tiedup/remake/network/selfbondage/PacketSelfBondage.java
View File

@@ -149,25 +149,25 @@ public class PacketSelfBondage {
stack.copy(), stack, state, player, tyingSeconds, player.level(), player
);
TyingTask currentTask = playerState.getCurrentTyingTask();
TyingTask currentTask = playerState.tasks().getCurrentTyingTask();
if (currentTask == null
|| !currentTask.isSameTarget(player)
|| currentTask.isOutdated()
|| !ItemStack.matches(currentTask.getBind(), stack)) {
playerState.setCurrentTyingTask(newTask);
playerState.tasks().setCurrentTyingTask(newTask);
newTask.start();
} else {
currentTask.update();
}
if (playerState.getCurrentTyingTask() == newTask) {
if (playerState.tasks().getCurrentTyingTask() == newTask) {
newTask.update();
}
// Clear completed task to prevent blocking future tying interactions
TyingTask activeTask = playerState.getCurrentTyingTask();
TyingTask activeTask = playerState.tasks().getCurrentTyingTask();
if (activeTask != null && activeTask.isStopped()) {
playerState.setCurrentTyingTask(null);
playerState.tasks().setCurrentTyingTask(null);
}
}