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

6
src/main/java/com/tiedup/remake/v2/bondage/TyingInteractionHelper.java
View File

@@ -97,14 +97,14 @@ public final class TyingInteractionHelper {
player
);
TyingTask currentTask = playerState.getCurrentTyingTask();
TyingTask currentTask = playerState.tasks().getCurrentTyingTask();
if (currentTask == null
|| !(currentTask instanceof V2TyingPlayerTask)
|| !currentTask.isSameTarget(target)
|| currentTask.isOutdated()
|| !ItemStack.matches(currentTask.getBind(), stack)) {
// Start new task (also handles case where existing task is V1 TyingPlayerTask)
playerState.setCurrentTyingTask(newTask);
playerState.tasks().setCurrentTyingTask(newTask);
newTask.start();
} else {
newTask = (V2TyingPlayerTask) currentTask;
@@ -114,7 +114,7 @@ public final class TyingInteractionHelper {
if (newTask.isStopped()) {
// Item already consumed by V2TyingPlayerTask.onComplete() — don't shrink again
playerState.setCurrentTyingTask(null);
playerState.tasks().setCurrentTyingTask(null);
TiedUpMod.LOGGER.info("[TyingInteraction] {} tied {}", player.getName().getString(), target.getName().getString());
}

2
src/main/java/com/tiedup/remake/v2/bondage/capability/V2BondageEquipment.java
View File

@@ -307,7 +307,7 @@ public class V2BondageEquipment implements IV2BondageEquipment {
savedPolePosition = BlockPos.of(tag.getLong("pole_position"));
savedPoleDimension = ResourceKey.create(
Registries.DIMENSION,
new ResourceLocation(tag.getString("pole_dimension"))
ResourceLocation.parse(tag.getString("pole_dimension"))
);
} catch (net.minecraft.ResourceLocationException e) {
com.tiedup.remake.core.TiedUpMod.LOGGER.warn(

2
src/main/java/com/tiedup/remake/v2/bondage/datadriven/DataDrivenItemParser.java
View File

@@ -329,7 +329,7 @@ public final class DataDrivenItemParser {
if (idPath.endsWith(".json")) {
idPath = idPath.substring(0, idPath.length() - 5);
}
ResourceLocation id = new ResourceLocation(
ResourceLocation id = ResourceLocation.fromNamespaceAndPath(
fileId.getNamespace(),
idPath
);

2
src/main/java/com/tiedup/remake/v2/bondage/items/V2Handcuffs.java
View File

@@ -19,7 +19,7 @@ public class V2Handcuffs extends AbstractV2BondageItem {
private static final Set<BodyRegionV2> REGIONS =
Collections.unmodifiableSet(EnumSet.of(BodyRegionV2.ARMS));
private static final ResourceLocation MODEL = new ResourceLocation(
private static final ResourceLocation MODEL = ResourceLocation.fromNamespaceAndPath(
TiedUpMod.MOD_ID,
"models/gltf/v2/handcuffs/cuffs_prototype.glb"
);

2
src/main/java/com/tiedup/remake/v2/client/DataDrivenIconOverrides.java
View File

@@ -184,7 +184,7 @@ public class DataDrivenIconOverrides extends ItemOverrides {
if (path.startsWith("item/")) {
String itemPath = path.substring("item/".length());
ModelResourceLocation mrl = new ModelResourceLocation(
new ResourceLocation(iconRL.getNamespace(), itemPath),
ResourceLocation.fromNamespaceAndPath(iconRL.getNamespace(), itemPath),
"inventory"
);
model = mc.getModelManager().getModel(mrl);

2
src/main/java/com/tiedup/remake/v2/client/V2ClientSetup.java
View File

@@ -126,7 +126,7 @@ public class V2ClientSetup {
DataDrivenIconOverrides.Mode mode
) {
ModelResourceLocation itemModelLoc = new ModelResourceLocation(
new ResourceLocation(TiedUpMod.MOD_ID, itemName),
ResourceLocation.fromNamespaceAndPath(TiedUpMod.MOD_ID, itemName),
"inventory"
);