Skip to content

Commit 9c71ac6

Browse files
committed
Registry arch
1 parent d3cf89f commit 9c71ac6

File tree

8 files changed

+33
-30
lines changed

8 files changed

+33
-30
lines changed

common/src/main/kotlin/com/lambda/gui/api/component/button/ButtonComponent.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.lambda.gui.api.component.button
22

3-
import com.lambda.core.LambdaSound
4-
import com.lambda.core.SoundManager.playSoundRandomly
3+
import com.lambda.sound.LambdaSound
4+
import com.lambda.sound.SoundManager.playSoundRandomly
55
import com.lambda.graphics.animation.Animation.Companion.exp
66
import com.lambda.gui.api.GuiEvent
77
import com.lambda.gui.api.component.core.list.ChildComponent
@@ -112,4 +112,4 @@ abstract class ButtonComponent(
112112
companion object {
113113
const val FILL_PARENT = -1.0
114114
}
115-
}
115+
}

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/ModuleButton.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import com.lambda.config.settings.NumericSetting
44
import com.lambda.config.settings.StringSetting
55
import com.lambda.config.settings.comparable.BooleanSetting
66
import com.lambda.config.settings.comparable.EnumSetting
7-
import com.lambda.core.LambdaSound
8-
import com.lambda.core.SoundManager.playSoundRandomly
7+
import com.lambda.sound.LambdaSound
8+
import com.lambda.sound.SoundManager.playSoundRandomly
99
import com.lambda.graphics.animation.Animation.Companion.exp
1010
import com.lambda.graphics.gl.Scissor.scissor
1111
import com.lambda.gui.api.GuiEvent
@@ -185,4 +185,4 @@ class ModuleButton(
185185

186186
override fun hashCode() =
187187
module.hashCode()
188-
}
188+
}

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/BooleanButton.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.lambda.gui.impl.clickgui.buttons.setting
22

33
import com.lambda.config.settings.comparable.BooleanSetting
4-
import com.lambda.core.LambdaSound
5-
import com.lambda.core.SoundManager.playSoundRandomly
4+
import com.lambda.sound.LambdaSound
5+
import com.lambda.sound.SoundManager.playSoundRandomly
66
import com.lambda.graphics.animation.Animation.Companion.exp
77
import com.lambda.gui.api.GuiEvent
88
import com.lambda.gui.api.component.core.list.ChildLayer
@@ -56,4 +56,4 @@ class BooleanButton(
5656
val pitch = if (value) 1.0 else 0.9
5757
playSoundRandomly(sound.event, pitch)
5858
}
59-
}
59+
}

common/src/main/kotlin/com/lambda/gui/impl/clickgui/buttons/setting/Slider.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.lambda.gui.impl.clickgui.buttons.setting
22

33
import com.lambda.config.AbstractSetting
4-
import com.lambda.core.LambdaSound
5-
import com.lambda.core.SoundManager.playSound
4+
import com.lambda.sound.LambdaSound
5+
import com.lambda.sound.SoundManager.playSound
66
import com.lambda.graphics.animation.Animation.Companion.exp
77
import com.lambda.gui.api.GuiEvent
88
import com.lambda.gui.api.component.core.list.ChildLayer
@@ -58,4 +58,4 @@ abstract class Slider <V : Any, T : AbstractSetting<V>>(
5858

5959
playSound(LambdaSound.BUTTON_CLICK.event, lerp(0.9, 1.2, p))
6060
}
61-
}
61+
}

common/src/main/kotlin/com/lambda/module/modules/player/Replay.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import com.google.gson.*
44
import com.lambda.brigadier.CommandResult
55
import com.lambda.config.RotationSettings
66
import com.lambda.context.SafeContext
7-
import com.lambda.core.SoundManager.playSound
7+
import com.lambda.sound.SoundManager.playSound
88
import com.lambda.core.TimerManager
99
import com.lambda.event.EventFlow.lambdaScope
1010
import com.lambda.event.events.KeyPressEvent
@@ -649,4 +649,4 @@ object Replay : Module(
649649
)
650650
}
651651
}
652-
}
652+
}

common/src/main/kotlin/com/lambda/sound/LambdaSound.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
package com.lambda.core
1+
package com.lambda.sound
22

3-
import com.lambda.core.SoundManager.toIdentifier
3+
import com.lambda.sound.SoundManager.toIdentifier
44
import net.minecraft.sound.SoundEvent
55
import net.minecraft.util.Identifier
66

@@ -17,4 +17,4 @@ enum class LambdaSound(val id: Identifier) {
1717
SETTINGS_CLOSE("settings_close".toIdentifier());
1818

1919
val event: SoundEvent = SoundEvent.of(id)
20-
}
20+
}
Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,16 @@
1-
package com.lambda.core
1+
package com.lambda.sound
22

33
import com.lambda.Lambda
44
import com.lambda.Lambda.mc
5+
import com.lambda.core.Loadable
56
import com.lambda.util.math.random
67
import net.minecraft.client.sound.PositionedSoundInstance
78
import net.minecraft.registry.Registries
89
import net.minecraft.registry.Registry
910
import net.minecraft.sound.SoundEvent
1011
import net.minecraft.util.Identifier
1112

12-
object SoundManager : Loadable {
13-
14-
override fun load(): String {
15-
LambdaSound.entries.forEach {
16-
Registry.register(Registries.SOUND_EVENT, it.id, it.event)
17-
}
18-
19-
return "Loaded ${LambdaSound.entries.size} sounds"
20-
}
21-
13+
object SoundManager {
2214
fun playSound(event: SoundEvent, pitch: Double = 1.0) {
2315
mc.soundManager.play(
2416
PositionedSoundInstance.master(event, pitch.toFloat())
@@ -34,4 +26,4 @@ object SoundManager : Loadable {
3426
}
3527

3628
fun String.toIdentifier() = Identifier(Lambda.MOD_ID, this)
37-
}
29+
}
Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
package com.lambda.sound
22

3-
object SoundRegistry {
3+
import com.lambda.core.Loadable
4+
import net.minecraft.registry.Registries
5+
import net.minecraft.registry.Registry
6+
7+
object SoundRegistry : Loadable {
8+
override fun load(): String {
9+
LambdaSound.entries.forEach {
10+
Registry.register(Registries.SOUND_EVENT, it.id, it.event)
11+
}
12+
13+
return "Loaded ${LambdaSound.entries.size} sounds"
14+
}
415
}

0 commit comments

Comments
 (0)