Refactor source layout

Introduce compat source sets and move all kotlin sources to the main directory

[no changelog]

2 files changed, 122 insertions, 0 deletions

diff --git a/src/main/kotlin/features/fixes/CompatibliltyFeatures.kt b/src/main/kotlin/features/fixes/CompatibliltyFeatures.kt
new file mode 100644
index 0000000..7c43cf6
--- /dev/null
+++ b/src/main/kotlin/features/fixes/CompatibliltyFeatures.kt
@@ -0,0 +1,51 @@
+
+
+package moe.nea.firmament.features.fixes
+
+import net.fabricmc.loader.api.FabricLoader
+import net.superkat.explosiveenhancement.api.ExplosiveApi
+import net.minecraft.particle.ParticleTypes
+import net.minecraft.util.math.Vec3d
+import moe.nea.firmament.annotations.Subscribe
+import moe.nea.firmament.events.ParticleSpawnEvent
+import moe.nea.firmament.features.FirmamentFeature
+import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.MC
+
+object CompatibliltyFeatures : FirmamentFeature {
+    override val identifier: String
+        get() = "compatibility"
+
+    object TConfig : ManagedConfig(identifier) {
+        val enhancedExplosions by toggle("explosion-enabled") { false }
+        val explosionSize by integer("explosion-power", 10, 50) { 1 }
+    }
+
+    override val config: ManagedConfig?
+        get() = TConfig
+
+    interface ExplosiveApiWrapper {
+        fun spawnParticle(vec3d: Vec3d, power: Float)
+    }
+
+    class ExplosiveApiWrapperImpl : ExplosiveApiWrapper {
+        override fun spawnParticle(vec3d: Vec3d, power: Float) {
+            ExplosiveApi.spawnParticles(MC.world, vec3d.x, vec3d.y, vec3d.z, TConfig.explosionSize / 10F)
+        }
+    }
+
+    val explosiveApiWrapper = if (FabricLoader.getInstance().isModLoaded("explosiveenhancement")) {
+        ExplosiveApiWrapperImpl()
+    } else null
+
+    @Subscribe
+    fun onExplosion(it: ParticleSpawnEvent) {
+        if (TConfig.enhancedExplosions &&
+            it.particleEffect.type == ParticleTypes.EXPLOSION_EMITTER &&
+            explosiveApiWrapper != null
+        ) {
+            it.cancel()
+            explosiveApiWrapper.spawnParticle(it.position, 2F)
+        }
+    }
+}
diff --git a/src/main/kotlin/features/fixes/Fixes.kt b/src/main/kotlin/features/fixes/Fixes.kt
new file mode 100644
index 0000000..d7b7a1c
--- /dev/null
+++ b/src/main/kotlin/features/fixes/Fixes.kt
@@ -0,0 +1,71 @@
+
+
+package moe.nea.firmament.features.fixes
+
+import moe.nea.jarvis.api.Point
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable
+import net.minecraft.client.MinecraftClient
+import net.minecraft.client.option.KeyBinding
+import net.minecraft.entity.player.PlayerEntity
+import net.minecraft.text.Text
+import net.minecraft.util.Arm
+import moe.nea.firmament.annotations.Subscribe
+import moe.nea.firmament.events.HudRenderEvent
+import moe.nea.firmament.events.WorldKeyboardEvent
+import moe.nea.firmament.features.FirmamentFeature
+import moe.nea.firmament.gui.config.ManagedConfig
+import moe.nea.firmament.util.MC
+import moe.nea.firmament.util.errorBoundary
+
+object Fixes : FirmamentFeature {
+    override val identifier: String
+        get() = "fixes"
+
+    object TConfig : ManagedConfig(identifier) {
+        val fixUnsignedPlayerSkins by toggle("player-skins") { true }
+        var autoSprint by toggle("auto-sprint") { false }
+        val autoSprintKeyBinding by keyBindingWithDefaultUnbound("auto-sprint-keybinding")
+        val autoSprintHud by position("auto-sprint-hud", 80, 10) { Point(0.0, 1.0) }
+        val peekChat by keyBindingWithDefaultUnbound("peek-chat")
+    }
+
+    override val config: ManagedConfig
+        get() = TConfig
+
+    fun handleIsPressed(
+        keyBinding: KeyBinding,
+        cir: CallbackInfoReturnable<Boolean>
+    ) {
+        if (keyBinding === MinecraftClient.getInstance().options.sprintKey && TConfig.autoSprint && MC.player?.isSprinting != true)
+            cir.returnValue = true
+    }
+
+    @Subscribe
+    fun onRenderHud(it: HudRenderEvent) {
+        if (!TConfig.autoSprintKeyBinding.isBound) return
+        it.context.matrices.push()
+        TConfig.autoSprintHud.applyTransformations(it.context.matrices)
+        it.context.drawText(
+            MC.font, Text.translatable(
+                if (TConfig.autoSprint)
+                    "firmament.fixes.auto-sprint.on"
+                else if (MC.player?.isSprinting == true)
+                    "firmament.fixes.auto-sprint.sprinting"
+                else
+                    "firmament.fixes.auto-sprint.not-sprinting"
+            ), 0, 0, -1, false
+        )
+        it.context.matrices.pop()
+    }
+
+    @Subscribe
+    fun onWorldKeyboard(it: WorldKeyboardEvent) {
+        if (it.matches(TConfig.autoSprintKeyBinding)) {
+            TConfig.autoSprint = !TConfig.autoSprint
+        }
+    }
+
+    fun shouldPeekChat(): Boolean {
+        return TConfig.peekChat.isPressed(atLeast = true)
+    }
+}