Remove internal phase comments and format code
Strip all Phase references, TODO/FUTURE roadmap notes, and internal planning comments from the codebase. Run Prettier for consistent formatting across all Java files.
This commit is contained in:
@@ -9,8 +9,8 @@ import com.tiedup.remake.commands.CommandHelper;
|
||||
import com.tiedup.remake.core.SystemMessageManager;
|
||||
import com.tiedup.remake.items.ModItems;
|
||||
import com.tiedup.remake.items.base.AdjustmentHelper;
|
||||
import com.tiedup.remake.items.base.BlindfoldVariant;
|
||||
import com.tiedup.remake.items.base.BindVariant;
|
||||
import com.tiedup.remake.items.base.BlindfoldVariant;
|
||||
import com.tiedup.remake.items.base.EarplugsVariant;
|
||||
import com.tiedup.remake.items.base.GagVariant;
|
||||
import com.tiedup.remake.items.base.ItemCollar;
|
||||
@@ -32,14 +32,18 @@ import net.minecraft.world.item.ItemStack;
|
||||
@SuppressWarnings("null")
|
||||
public class BondageSubCommand {
|
||||
|
||||
public static void register(LiteralArgumentBuilder<CommandSourceStack> root) {
|
||||
public static void register(
|
||||
LiteralArgumentBuilder<CommandSourceStack> root
|
||||
) {
|
||||
// /tiedup tie <player>
|
||||
root.then(
|
||||
Commands.literal("tie")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::tie)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::tie)
|
||||
)
|
||||
);
|
||||
// /tiedup untie <player>
|
||||
@@ -47,8 +51,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("untie")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::untie)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::untie)
|
||||
)
|
||||
);
|
||||
// /tiedup gag <player>
|
||||
@@ -56,8 +62,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("gag")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::gag)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::gag)
|
||||
)
|
||||
);
|
||||
// /tiedup ungag <player>
|
||||
@@ -65,8 +73,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("ungag")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::ungag)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::ungag)
|
||||
)
|
||||
);
|
||||
// /tiedup blindfold <player>
|
||||
@@ -74,8 +84,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("blindfold")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::blindfold)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::blindfold)
|
||||
)
|
||||
);
|
||||
// /tiedup unblind <player>
|
||||
@@ -83,8 +95,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("unblind")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::unblind)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::unblind)
|
||||
)
|
||||
);
|
||||
// /tiedup collar <player>
|
||||
@@ -92,8 +106,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("collar")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::collar)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::collar)
|
||||
)
|
||||
);
|
||||
// /tiedup takecollar <player>
|
||||
@@ -101,8 +117,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("takecollar")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::takecollar)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::takecollar)
|
||||
)
|
||||
);
|
||||
// /tiedup takeearplugs <player>
|
||||
@@ -110,8 +128,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("takeearplugs")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::takeearplugs)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::takeearplugs)
|
||||
)
|
||||
);
|
||||
// /tiedup putearplugs <player>
|
||||
@@ -119,8 +139,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("putearplugs")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::putearplugs)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::putearplugs)
|
||||
)
|
||||
);
|
||||
// /tiedup takeclothes <player>
|
||||
@@ -128,8 +150,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("takeclothes")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::takeclothes)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::takeclothes)
|
||||
)
|
||||
);
|
||||
// /tiedup putclothes <player>
|
||||
@@ -137,8 +161,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("putclothes")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::putclothes)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::putclothes)
|
||||
)
|
||||
);
|
||||
// /tiedup fullyrestrain <player>
|
||||
@@ -146,8 +172,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("fullyrestrain")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::fullyrestrain)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::fullyrestrain)
|
||||
)
|
||||
);
|
||||
// /tiedup enslave <player>
|
||||
@@ -155,8 +183,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("enslave")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::enslave)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::enslave)
|
||||
)
|
||||
);
|
||||
// /tiedup free <player>
|
||||
@@ -164,8 +194,10 @@ public class BondageSubCommand {
|
||||
Commands.literal("free")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.executes(BondageSubCommand::free)
|
||||
Commands.argument(
|
||||
"player",
|
||||
EntityArgument.player()
|
||||
).executes(BondageSubCommand::free)
|
||||
)
|
||||
);
|
||||
// /tiedup adjust <player> <type:gag|blindfold|all> <value>
|
||||
@@ -173,29 +205,26 @@ public class BondageSubCommand {
|
||||
Commands.literal("adjust")
|
||||
.requires(CommandHelper.REQUIRES_OP)
|
||||
.then(
|
||||
Commands.argument("player", EntityArgument.player())
|
||||
.then(
|
||||
Commands.argument("type", StringArgumentType.word())
|
||||
.suggests((ctx, builder) -> {
|
||||
builder.suggest("gag");
|
||||
builder.suggest("blindfold");
|
||||
builder.suggest("all");
|
||||
return builder.buildFuture();
|
||||
})
|
||||
.then(
|
||||
Commands.argument(
|
||||
"value",
|
||||
FloatArgumentType.floatArg(-4.0f, 4.0f)
|
||||
).executes(BondageSubCommand::adjust)
|
||||
)
|
||||
)
|
||||
Commands.argument("player", EntityArgument.player()).then(
|
||||
Commands.argument("type", StringArgumentType.word())
|
||||
.suggests((ctx, builder) -> {
|
||||
builder.suggest("gag");
|
||||
builder.suggest("blindfold");
|
||||
builder.suggest("all");
|
||||
return builder.buildFuture();
|
||||
})
|
||||
.then(
|
||||
Commands.argument(
|
||||
"value",
|
||||
FloatArgumentType.floatArg(-4.0f, 4.0f)
|
||||
).executes(BondageSubCommand::adjust)
|
||||
)
|
||||
)
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
// ========================================
|
||||
// Command Implementations
|
||||
// ========================================
|
||||
|
||||
/**
|
||||
* /tiedup tie <player>
|
||||
@@ -582,7 +611,9 @@ public class BondageSubCommand {
|
||||
boolean adjustedBlindfold = false;
|
||||
|
||||
if (type.equals("gag") || type.equals("all")) {
|
||||
ItemStack gag = state.getEquipment(com.tiedup.remake.v2.BodyRegionV2.MOUTH);
|
||||
ItemStack gag = state.getEquipment(
|
||||
com.tiedup.remake.v2.BodyRegionV2.MOUTH
|
||||
);
|
||||
if (!gag.isEmpty()) {
|
||||
AdjustmentHelper.setAdjustment(gag, value);
|
||||
adjustedGag = true;
|
||||
@@ -590,7 +621,9 @@ public class BondageSubCommand {
|
||||
}
|
||||
|
||||
if (type.equals("blindfold") || type.equals("all")) {
|
||||
ItemStack blindfold = state.getEquipment(com.tiedup.remake.v2.BodyRegionV2.EYES);
|
||||
ItemStack blindfold = state.getEquipment(
|
||||
com.tiedup.remake.v2.BodyRegionV2.EYES
|
||||
);
|
||||
if (!blindfold.isEmpty()) {
|
||||
AdjustmentHelper.setAdjustment(blindfold, value);
|
||||
adjustedBlindfold = true;
|
||||
|
||||
Reference in New Issue
Block a user