Skip to content

Commit

Permalink
refactor: some mild refactoring
Browse files Browse the repository at this point in the history
  • Loading branch information
@StillLutto
StillLutto committed Dec 20, 2024
1 parent 344a574 commit 06720a9
Show file tree
Hide file tree
Showing 20 changed files with 38 additions and 45 deletions.
1 change: 0 additions & 1 deletion common/src/main/kotlin/com/undefined/stellar/argument/ArgumentHandler.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ import java.util.*
/**
* An open class that adds all the methods for adding arguments
*
* @code
* @since 1.0
*/
open class ArgumentHandler {
Expand Down
2 changes: 1 addition & 1 deletion ...r/argument/types/item/ItemTypeArgument.kt → ...gument/types/registry/ItemTypeArgument.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.undefined.stellar.argument.types.item
package com.undefined.stellar.argument.types.registry

import com.undefined.stellar.AbstractStellarCommand
import com.undefined.stellar.argument.AbstractStellarArgument
Expand Down
2 changes: 1 addition & 1 deletion ...rgument/types/item/PatternTypeArgument.kt → ...ent/types/registry/PatternTypeArgument.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.undefined.stellar.argument.types.item
package com.undefined.stellar.argument.types.registry

import com.undefined.stellar.AbstractStellarCommand
import com.undefined.stellar.argument.AbstractStellarArgument
Expand Down
2 changes: 1 addition & 1 deletion ...lar/argument/types/item/PotionArgument.kt → ...argument/types/registry/PotionArgument.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.undefined.stellar.argument.types.item
package com.undefined.stellar.argument.types.registry

import com.undefined.stellar.AbstractStellarCommand
import com.undefined.stellar.argument.AbstractStellarArgument
Expand Down
2 changes: 1 addition & 1 deletion ...gument/types/item/TrimMaterialArgument.kt → ...nt/types/registry/TrimMaterialArgument.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.undefined.stellar.argument.types.item
package com.undefined.stellar.argument.types.registry

import com.undefined.stellar.AbstractStellarCommand
import com.undefined.stellar.argument.AbstractStellarArgument
Expand Down
2 changes: 1 addition & 1 deletion ...rgument/types/item/TrimPatternArgument.kt → ...ent/types/registry/TrimPatternArgument.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.undefined.stellar.argument.types.item
package com.undefined.stellar.argument.types.registry

import com.undefined.stellar.AbstractStellarCommand
import com.undefined.stellar.argument.AbstractStellarArgument
Expand Down
2 changes: 1 addition & 1 deletion ...r/argument/types/item/ParticleArgument.kt → .../argument/types/world/ParticleArgument.kt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.undefined.stellar.argument.types.item
package com.undefined.stellar.argument.types.world

import com.undefined.stellar.AbstractStellarCommand
import com.undefined.stellar.argument.AbstractStellarArgument
Expand Down
14 changes: 8 additions & 6 deletions server/src/main/kotlin/com/undefined/stellar/Main.kt
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,21 @@
package com.undefined.stellar

import org.bukkit.Location
import org.bukkit.Material
import org.bukkit.entity.Player
import org.bukkit.inventory.ItemStack
import org.bukkit.plugin.java.JavaPlugin
import java.util.function.Predicate

class Main : JavaPlugin() {

override fun onEnable() {
val command = StellarCommand("test")
command.addArgument("t")
.addLocationArgument("block")
StellarCommand("isItem")
.addItemArgument(name = "item")
.addExecution<Player> {
sender.sendMessage(getArgument<Location>("block").toVector().toString())
val predicate = getArgument<Predicate<ItemStack>>("item")
sender.inventory.setItem()
}
command.register(this)
.register(this)
}

}
6 changes: 2 additions & 4 deletions v1_19_2/src/main/kotlin/com/undefined/stellar/v1_19_2/ArgumentHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ import net.minecraft.network.chat.Component
import net.minecraft.resources.ResourceKey
import net.minecraft.server.MinecraftServer
import net.minecraft.server.level.ColumnPos
import net.minecraft.world.entity.ai.attributes.Attribute
import net.minecraft.world.inventory.MenuType
import net.minecraft.world.level.Level
import net.minecraft.world.level.block.state.pattern.BlockInWorld
Expand All @@ -79,7 +78,6 @@ import org.bukkit.scoreboard.DisplaySlot
import java.time.Duration
import java.util.*
import java.util.function.Predicate
import java.util.function.Supplier

@Suppress("UNCHECKED_CAST")
object ArgumentHelper {
Expand Down Expand Up @@ -135,7 +133,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> ObjectiveArgument.objective()
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.criteria()
is com.undefined.stellar.argument.types.math.OperationArgument -> OperationArgument.operation()
is com.undefined.stellar.argument.types.item.ParticleArgument -> ParticleArgument.particle()
is com.undefined.stellar.argument.types.world.ParticleArgument -> ParticleArgument.particle()
is com.undefined.stellar.argument.types.math.AngleArgument -> AngleArgument.angle()
is com.undefined.stellar.argument.types.math.RotationArgument -> RotationArgument.rotation()
is DisplaySlotArgument -> ScoreboardSlotArgument.displaySlot()
Expand Down Expand Up @@ -219,7 +217,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> Bukkit.getScoreboardManager().mainScoreboard.getObjective(ObjectiveArgument.getObjective(context, argument.name).name)
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.getCriteria(context, argument.name).name
is com.undefined.stellar.argument.types.math.OperationArgument -> Operation.getOperation(getArgumentInput(context, argument.name) ?: return null)
is com.undefined.stellar.argument.types.item.ParticleArgument -> {
is com.undefined.stellar.argument.types.world.ParticleArgument -> {
val particleOptions = ParticleArgument.getParticle(context, argument.name)
getParticleData(context, CraftParticle.toBukkit(particleOptions.type), particleOptions)
}
Expand Down
4 changes: 2 additions & 2 deletions v1_19_3/src/main/kotlin/com/undefined/stellar/v1_19_3/ArgumentHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> ObjectiveArgument.objective()
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.criteria()
is com.undefined.stellar.argument.types.math.OperationArgument -> OperationArgument.operation()
is com.undefined.stellar.argument.types.item.ParticleArgument -> ParticleArgument.particle(
is com.undefined.stellar.argument.types.world.ParticleArgument -> ParticleArgument.particle(
COMMAND_BUILD_CONTEXT
)
is com.undefined.stellar.argument.types.math.AngleArgument -> AngleArgument.angle()
Expand Down Expand Up @@ -219,7 +219,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> Bukkit.getScoreboardManager().mainScoreboard.getObjective(ObjectiveArgument.getObjective(context, argument.name).name)
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.getCriteria(context, argument.name).name
is com.undefined.stellar.argument.types.math.OperationArgument -> Operation.getOperation(getArgumentInput(context, argument.name) ?: return null)
is com.undefined.stellar.argument.types.item.ParticleArgument -> {
is com.undefined.stellar.argument.types.world.ParticleArgument -> {
val particleOptions = ParticleArgument.getParticle(context, argument.name)
getParticleData(context, CraftParticle.toBukkit(particleOptions.type), particleOptions)
}
Expand Down
4 changes: 2 additions & 2 deletions v1_19_4/src/main/kotlin/com/undefined/stellar/v1_19_4/ArgumentHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> ObjectiveArgument.objective()
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.criteria()
is com.undefined.stellar.argument.types.math.OperationArgument -> OperationArgument.operation()
is com.undefined.stellar.argument.types.item.ParticleArgument -> ParticleArgument.particle(
is com.undefined.stellar.argument.types.world.ParticleArgument -> ParticleArgument.particle(
COMMAND_BUILD_CONTEXT
)
is com.undefined.stellar.argument.types.math.AngleArgument -> AngleArgument.angle()
Expand Down Expand Up @@ -226,7 +226,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> Bukkit.getScoreboardManager().mainScoreboard.getObjective(ObjectiveArgument.getObjective(context, argument.name).name)
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.getCriteria(context, argument.name).name
is com.undefined.stellar.argument.types.math.OperationArgument -> Operation.getOperation(getArgumentInput(context, argument.name) ?: return null)
is com.undefined.stellar.argument.types.item.ParticleArgument -> {
is com.undefined.stellar.argument.types.world.ParticleArgument -> {
val particleOptions = ParticleArgument.getParticle(context, argument.name)
getParticleData(context, CraftParticle.toBukkit(particleOptions.type), particleOptions)
}
Expand Down
4 changes: 2 additions & 2 deletions v1_20/src/main/kotlin/com/undefined/stellar/v1_20/ArgumentHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> ObjectiveArgument.objective()
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.criteria()
is com.undefined.stellar.argument.types.math.OperationArgument -> OperationArgument.operation()
is com.undefined.stellar.argument.types.item.ParticleArgument -> ParticleArgument.particle(COMMAND_BUILD_CONTEXT)
is com.undefined.stellar.argument.types.world.ParticleArgument -> ParticleArgument.particle(COMMAND_BUILD_CONTEXT)
is com.undefined.stellar.argument.types.math.AngleArgument -> AngleArgument.angle()
is com.undefined.stellar.argument.types.math.RotationArgument -> RotationArgument.rotation()
is DisplaySlotArgument -> ScoreboardSlotArgument.displaySlot()
Expand Down Expand Up @@ -220,7 +220,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> Bukkit.getScoreboardManager().mainScoreboard.getObjective(ObjectiveArgument.getObjective(context, argument.name).name)
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.getCriteria(context, argument.name).name
is com.undefined.stellar.argument.types.math.OperationArgument -> Operation.getOperation(getArgumentInput(context, argument.name) ?: return null)
is com.undefined.stellar.argument.types.item.ParticleArgument -> {
is com.undefined.stellar.argument.types.world.ParticleArgument -> {
val particleOptions = ParticleArgument.getParticle(context, argument.name)
getParticleData(context, CraftParticle.toBukkit(particleOptions.type), particleOptions)
}
Expand Down
4 changes: 2 additions & 2 deletions v1_20_1/src/main/kotlin/com/undefined/stellar/v1_20_1/ArgumentHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> ObjectiveArgument.objective()
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.criteria()
is com.undefined.stellar.argument.types.math.OperationArgument -> OperationArgument.operation()
is com.undefined.stellar.argument.types.item.ParticleArgument -> ParticleArgument.particle(COMMAND_BUILD_CONTEXT)
is com.undefined.stellar.argument.types.world.ParticleArgument -> ParticleArgument.particle(COMMAND_BUILD_CONTEXT)
is com.undefined.stellar.argument.types.math.AngleArgument -> AngleArgument.angle()
is com.undefined.stellar.argument.types.math.RotationArgument -> RotationArgument.rotation()
is DisplaySlotArgument -> ScoreboardSlotArgument.displaySlot()
Expand Down Expand Up @@ -220,7 +220,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> Bukkit.getScoreboardManager().mainScoreboard.getObjective(ObjectiveArgument.getObjective(context, argument.name).name)
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.getCriteria(context, argument.name).name
is com.undefined.stellar.argument.types.math.OperationArgument -> Operation.getOperation(getArgumentInput(context, argument.name) ?: return null)
is com.undefined.stellar.argument.types.item.ParticleArgument -> {
is com.undefined.stellar.argument.types.world.ParticleArgument -> {
val particleOptions = ParticleArgument.getParticle(context, argument.name)
getParticleData(context, CraftParticle.toBukkit(particleOptions.type), particleOptions)
}
Expand Down
5 changes: 2 additions & 3 deletions v1_20_2/src/main/kotlin/com/undefined/stellar/v1_20_2/ArgumentHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ object ArgumentHelper {
fun <T : AbstractStellarArgument<*>> getArgumentType(argument: T): ArgumentType<*> =
when (argument) {
is ListArgument<*> -> getArgumentType(argument.type)
is EnumArgument<*> -> StringArgumentType.word()
is CustomArgument<*> -> getArgumentType(argument.type)
is StringArgument -> brigadier(argument.type)
is PhraseArgument -> brigadier(StringType.PHRASE)
Expand Down Expand Up @@ -138,7 +137,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> ObjectiveArgument.objective()
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.criteria()
is com.undefined.stellar.argument.types.math.OperationArgument -> OperationArgument.operation()
is com.undefined.stellar.argument.types.item.ParticleArgument -> ParticleArgument.particle(COMMAND_BUILD_CONTEXT)
is com.undefined.stellar.argument.types.world.ParticleArgument -> ParticleArgument.particle(COMMAND_BUILD_CONTEXT)
is com.undefined.stellar.argument.types.math.AngleArgument -> AngleArgument.angle()
is com.undefined.stellar.argument.types.math.RotationArgument -> RotationArgument.rotation()
is DisplaySlotArgument -> ScoreboardSlotArgument.displaySlot()
Expand Down Expand Up @@ -222,7 +221,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> Bukkit.getScoreboardManager().mainScoreboard.getObjective(ObjectiveArgument.getObjective(context, argument.name).name)
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.getCriteria(context, argument.name).name
is com.undefined.stellar.argument.types.math.OperationArgument -> Operation.getOperation(getArgumentInput(context, argument.name) ?: return null)
is com.undefined.stellar.argument.types.item.ParticleArgument -> {
is com.undefined.stellar.argument.types.world.ParticleArgument -> {
val particleOptions = ParticleArgument.getParticle(context, argument.name)
getParticleData(context, CraftParticle.minecraftToBukkit(particleOptions.type), particleOptions)
}
Expand Down
5 changes: 2 additions & 3 deletions v1_20_4/src/main/kotlin/com/undefined/stellar/v1_20_4/ArgumentHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ object ArgumentHelper {
fun <T : AbstractStellarArgument<*>> getArgumentType(argument: T): ArgumentType<*> =
when (argument) {
is ListArgument<*> -> getArgumentType(argument.type)
is EnumArgument<*> -> StringArgumentType.word()
is CustomArgument<*> -> getArgumentType(argument.type)
is StringArgument -> brigadier(argument.type)
is PhraseArgument -> brigadier(StringType.PHRASE)
Expand Down Expand Up @@ -138,7 +137,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> ObjectiveArgument.objective()
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.criteria()
is com.undefined.stellar.argument.types.math.OperationArgument -> OperationArgument.operation()
is com.undefined.stellar.argument.types.item.ParticleArgument -> ParticleArgument.particle(COMMAND_BUILD_CONTEXT)
is com.undefined.stellar.argument.types.world.ParticleArgument -> ParticleArgument.particle(COMMAND_BUILD_CONTEXT)
is com.undefined.stellar.argument.types.math.AngleArgument -> AngleArgument.angle()
is com.undefined.stellar.argument.types.math.RotationArgument -> RotationArgument.rotation()
is DisplaySlotArgument -> ScoreboardSlotArgument.displaySlot()
Expand Down Expand Up @@ -222,7 +221,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> Bukkit.getScoreboardManager().mainScoreboard.getObjective(ObjectiveArgument.getObjective(context, argument.name).name)
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.getCriteria(context, argument.name).name
is com.undefined.stellar.argument.types.math.OperationArgument -> Operation.getOperation(getArgumentInput(context, argument.name) ?: return null)
is com.undefined.stellar.argument.types.item.ParticleArgument -> {
is com.undefined.stellar.argument.types.world.ParticleArgument -> {
val particleOptions = ParticleArgument.getParticle(context, argument.name)
getParticleData(context, CraftParticle.minecraftToBukkit(particleOptions.type), particleOptions)
}
Expand Down
4 changes: 2 additions & 2 deletions v1_20_6/src/main/kotlin/com/undefined/stellar/v1_20_6/ArgumentHelper.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> ObjectiveArgument.objective()
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.criteria()
is com.undefined.stellar.argument.types.math.OperationArgument -> OperationArgument.operation()
is com.undefined.stellar.argument.types.item.ParticleArgument -> ParticleArgument.particle(COMMAND_BUILD_CONTEXT)
is com.undefined.stellar.argument.types.world.ParticleArgument -> ParticleArgument.particle(COMMAND_BUILD_CONTEXT)
is com.undefined.stellar.argument.types.math.AngleArgument -> AngleArgument.angle()
is com.undefined.stellar.argument.types.math.RotationArgument -> RotationArgument.rotation()
is DisplaySlotArgument -> ScoreboardSlotArgument.displaySlot()
Expand Down Expand Up @@ -218,7 +218,7 @@ object ArgumentHelper {
is com.undefined.stellar.argument.types.scoreboard.ObjectiveArgument -> Bukkit.getScoreboardManager().mainScoreboard.getObjective(ObjectiveArgument.getObjective(context, argument.name).name)
is com.undefined.stellar.argument.types.scoreboard.ObjectiveCriteriaArgument -> ObjectiveCriteriaArgument.getCriteria(context, argument.name).name
is com.undefined.stellar.argument.types.math.OperationArgument -> Operation.getOperation(getArgumentInput(context, argument.name) ?: return null)
is com.undefined.stellar.argument.types.item.ParticleArgument -> {
is com.undefined.stellar.argument.types.world.ParticleArgument -> {
val particleOptions = ParticleArgument.getParticle(context, argument.name)
getParticleData(context, CraftParticle.minecraftToBukkit(particleOptions.type), particleOptions)
}
Expand Down
Loading

0 comments on commit 06720a9

Please sign in to comment.