Added permissions and removed some options used for the video

TheCymaera · Oct 14, 2024 · d0eb492 · d0eb492
1 parent dec8a0a
commit d0eb492
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 21 deletions.
diff --git a/src/main/kotlin/com/heledron/sky_torch/laser/Cloud.kt b/src/main/kotlin/com/heledron/sky_torch/laser/Cloud.kt
@@ -18,7 +18,6 @@ class Cloud(
     val growth: Double,
     val maxAge: Int,
     val blocks: List<BlockData>,
-    var disableSmartRendering: Boolean = false,
 ): GameObject() {
     var age = 0
 
@@ -51,12 +50,8 @@ class Cloud(
         AppState.renderer.render(this, getModel())
     }
 
-    private fun getSmartRenderLocation(): Location {
-        return if (disableSmartRendering) location else renderLocation
-    }
-
     private fun getModel() = blockModel(
-        location = getSmartRenderLocation(),
+        location = renderLocation,
         init = {
             it.brightness = Display.Brightness(15, 15)
             it.teleportDuration = 1
@@ -67,7 +62,7 @@ class Cloud(
             val index = (age.toFloat() / maxAge * blocks.size).toInt().coerceAtMost(blocks.size - 1)
 
 //            val location = location.clone().add(velocity.clone().normalize().multiply(size / 2))
-            val diff = location.toVector().subtract(getSmartRenderLocation().toVector())
+            val diff = location.toVector().subtract(renderLocation.toVector())
 
             it.block = blocks[index]
 

diff --git a/src/main/kotlin/com/heledron/sky_torch/laser/burnWave.kt b/src/main/kotlin/com/heledron/sky_torch/laser/burnWave.kt
@@ -30,8 +30,6 @@ class BurnWaveOptions {
     var airDragCoefficient = .005
 
 
-    var disableRotation = false
-    var disableSmartRendering = false
     var disableHeat = false
 }
 
@@ -62,17 +60,7 @@ private fun spawnBurnCloud(placement: BurnWavePlacement, options: BurnWaveOption
     maxAge = Random.nextInt(options.durationMin, options.durationMax),
     blocks = options.palette.burn.burnWave.random(),
     renderLocation = placement.render.toLocation(placement.world),
-    disableSmartRendering = options.disableSmartRendering,
 ).apply {
-    if  (options.disableRotation) {
-        pitch = 0f
-        yaw = 0f
-        pitchVelocity = 0f
-        yawVelocity = 0f
-    }
-
-
-
 //    val affectedPlayers = mutableListOf<org.bukkit.entity.Player>()
 
     onUpdate = {
@@ -102,7 +90,7 @@ private fun spawnBurnCloud(placement: BurnWavePlacement, options: BurnWaveOption
         val top = location.clone().add(.0,scanUpwards,.0)
         val ground = raycastGround(top, Vector(0, -1, 0), scanUpwards + scanDownwards)?.hitPosition?.toLocation(location.world!!) ?: location.clone()
 
-        if (location.block.type.isOccluding && !options.disableRotation) {
+        if (location.block.type.isOccluding) {
             location.y = location.y.lerp(ground.y + size / 2, .03)
         }
 

diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml
@@ -7,12 +7,30 @@ commands:
   items:
     description: Open the items menu
     usage: /items
+    permission: sky_torch.items
   reload_config:
     description: Reload the configuration file
     usage: /reload_config
+    permission: sky_torch.reload_config
   preset:
     description: Select a preset
     usage: /preset <enum>
+    permission: sky_torch.preset
   scale:
     description: Scale the laser
-    usage: /scale <double>
+    usage: /scale <double>
+    permission: sky_torch.scale
+
+permissions:
+  sky_torch.items:
+    description: Allows access to the items command
+    default: op
+  sky_torch.reload_config:
+    description: Allows access to the reload_config command
+    default: op
+  sky_torch.preset:
+    description: Allows access to the preset command
+    default: op
+  sky_torch.scale:
+    description: Allows access to the scale command
+    default: op