diff --git a/src/main/kotlin/net/shadowfacts/asmr/TestScreen.kt b/src/main/kotlin/net/shadowfacts/asmr/TestScreen.kt index b0a0383..86b3092 100644 --- a/src/main/kotlin/net/shadowfacts/asmr/TestScreen.kt +++ b/src/main/kotlin/net/shadowfacts/asmr/TestScreen.kt @@ -1,13 +1,13 @@ package net.shadowfacts.asmr import net.shadowfacts.kiwidsl.dsl -import net.shadowfacts.shadowui.Screen -import net.shadowfacts.shadowui.view.View -import net.shadowfacts.shadowui.Window -import net.shadowfacts.shadowui.geometry.Axis -import net.shadowfacts.shadowui.geometry.Size -import net.shadowfacts.shadowui.util.Color -import net.shadowfacts.shadowui.view.StackView +import net.shadowfacts.cacao.Screen +import net.shadowfacts.cacao.view.View +import net.shadowfacts.cacao.Window +import net.shadowfacts.cacao.geometry.Axis +import net.shadowfacts.cacao.geometry.Size +import net.shadowfacts.cacao.util.Color +import net.shadowfacts.cacao.view.StackView /** * @author shadowfacts diff --git a/src/main/kotlin/net/shadowfacts/shadowui/LayoutVariable.kt b/src/main/kotlin/net/shadowfacts/cacao/LayoutVariable.kt similarity index 78% rename from src/main/kotlin/net/shadowfacts/shadowui/LayoutVariable.kt rename to src/main/kotlin/net/shadowfacts/cacao/LayoutVariable.kt index 1f724d7..fa7f5b1 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/LayoutVariable.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/LayoutVariable.kt @@ -1,6 +1,6 @@ -package net.shadowfacts.shadowui +package net.shadowfacts.cacao -import net.shadowfacts.shadowui.view.View +import net.shadowfacts.cacao.view.View import no.birkett.kiwi.Variable /** diff --git a/src/main/kotlin/net/shadowfacts/cacao/README.md b/src/main/kotlin/net/shadowfacts/cacao/README.md new file mode 100644 index 0000000..cd3b3c6 --- /dev/null +++ b/src/main/kotlin/net/shadowfacts/cacao/README.md @@ -0,0 +1,3 @@ +# Cacao + +Cacao is a UI framework for Fabric/Minecraft mods based on Apple's [Cocoa](https://en.wikipedia.org/wiki/Cocoa_(API)) UI toolkit. \ No newline at end of file diff --git a/src/main/kotlin/net/shadowfacts/shadowui/Screen.kt b/src/main/kotlin/net/shadowfacts/cacao/Screen.kt similarity index 82% rename from src/main/kotlin/net/shadowfacts/shadowui/Screen.kt rename to src/main/kotlin/net/shadowfacts/cacao/Screen.kt index b0b1938..43dfb39 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/Screen.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/Screen.kt @@ -1,9 +1,8 @@ -package net.shadowfacts.shadowui +package net.shadowfacts.cacao import net.minecraft.client.gui.screen.Screen import net.minecraft.network.chat.TextComponent -import net.shadowfacts.shadowui.geometry.Point -import no.birkett.kiwi.Solver +import net.shadowfacts.cacao.geometry.Point /** * @author shadowfacts diff --git a/src/main/kotlin/net/shadowfacts/shadowui/Window.kt b/src/main/kotlin/net/shadowfacts/cacao/Window.kt similarity index 76% rename from src/main/kotlin/net/shadowfacts/shadowui/Window.kt rename to src/main/kotlin/net/shadowfacts/cacao/Window.kt index 1b0db95..476b475 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/Window.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/Window.kt @@ -1,7 +1,7 @@ -package net.shadowfacts.shadowui +package net.shadowfacts.cacao -import net.shadowfacts.shadowui.geometry.Point -import net.shadowfacts.shadowui.view.View +import net.shadowfacts.cacao.geometry.Point +import net.shadowfacts.cacao.view.View import no.birkett.kiwi.Solver /** diff --git a/src/main/kotlin/net/shadowfacts/shadowui/geometry/Axis.kt b/src/main/kotlin/net/shadowfacts/cacao/geometry/Axis.kt similarity index 79% rename from src/main/kotlin/net/shadowfacts/shadowui/geometry/Axis.kt rename to src/main/kotlin/net/shadowfacts/cacao/geometry/Axis.kt index 928e9f9..69a4634 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/geometry/Axis.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/geometry/Axis.kt @@ -1,4 +1,4 @@ -package net.shadowfacts.shadowui.geometry +package net.shadowfacts.cacao.geometry /** * @author shadowfacts diff --git a/src/main/kotlin/net/shadowfacts/shadowui/geometry/AxisPosition.kt b/src/main/kotlin/net/shadowfacts/cacao/geometry/AxisPosition.kt similarity index 66% rename from src/main/kotlin/net/shadowfacts/shadowui/geometry/AxisPosition.kt rename to src/main/kotlin/net/shadowfacts/cacao/geometry/AxisPosition.kt index aaabf86..b0666b3 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/geometry/AxisPosition.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/geometry/AxisPosition.kt @@ -1,4 +1,4 @@ -package net.shadowfacts.shadowui.geometry +package net.shadowfacts.cacao.geometry /** * @author shadowfacts diff --git a/src/main/kotlin/net/shadowfacts/shadowui/geometry/Point.kt b/src/main/kotlin/net/shadowfacts/cacao/geometry/Point.kt similarity index 77% rename from src/main/kotlin/net/shadowfacts/shadowui/geometry/Point.kt rename to src/main/kotlin/net/shadowfacts/cacao/geometry/Point.kt index 238932c..9678816 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/geometry/Point.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/geometry/Point.kt @@ -1,4 +1,4 @@ -package net.shadowfacts.shadowui.geometry +package net.shadowfacts.cacao.geometry /** * @author shadowfacts diff --git a/src/main/kotlin/net/shadowfacts/shadowui/geometry/Rect.kt b/src/main/kotlin/net/shadowfacts/cacao/geometry/Rect.kt similarity index 91% rename from src/main/kotlin/net/shadowfacts/shadowui/geometry/Rect.kt rename to src/main/kotlin/net/shadowfacts/cacao/geometry/Rect.kt index b33d41b..e2561c6 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/geometry/Rect.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/geometry/Rect.kt @@ -1,4 +1,4 @@ -package net.shadowfacts.shadowui.geometry +package net.shadowfacts.cacao.geometry /** * @author shadowfacts diff --git a/src/main/kotlin/net/shadowfacts/cacao/geometry/Size.kt b/src/main/kotlin/net/shadowfacts/cacao/geometry/Size.kt new file mode 100644 index 0000000..efcd304 --- /dev/null +++ b/src/main/kotlin/net/shadowfacts/cacao/geometry/Size.kt @@ -0,0 +1,6 @@ +package net.shadowfacts.cacao.geometry + +/** + * @author shadowfacts + */ +data class Size(val width: Double, val height: Double) \ No newline at end of file diff --git a/src/main/kotlin/net/shadowfacts/shadowui/util/Color.kt b/src/main/kotlin/net/shadowfacts/cacao/util/Color.kt similarity index 92% rename from src/main/kotlin/net/shadowfacts/shadowui/util/Color.kt rename to src/main/kotlin/net/shadowfacts/cacao/util/Color.kt index 885355e..d5314b5 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/util/Color.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/util/Color.kt @@ -1,4 +1,4 @@ -package net.shadowfacts.shadowui.util +package net.shadowfacts.cacao.util /** * @author shadowfacts diff --git a/src/main/kotlin/net/shadowfacts/shadowui/util/RenderHelper.kt b/src/main/kotlin/net/shadowfacts/cacao/util/RenderHelper.kt similarity index 75% rename from src/main/kotlin/net/shadowfacts/shadowui/util/RenderHelper.kt rename to src/main/kotlin/net/shadowfacts/cacao/util/RenderHelper.kt index 67c3c36..a8787d4 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/util/RenderHelper.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/util/RenderHelper.kt @@ -1,7 +1,7 @@ -package net.shadowfacts.shadowui.util +package net.shadowfacts.cacao.util import net.minecraft.client.gui.DrawableHelper -import net.shadowfacts.shadowui.geometry.Rect +import net.shadowfacts.cacao.geometry.Rect /** * @author shadowfacts diff --git a/src/main/kotlin/net/shadowfacts/shadowui/view/Label.kt b/src/main/kotlin/net/shadowfacts/cacao/view/Label.kt similarity index 85% rename from src/main/kotlin/net/shadowfacts/shadowui/view/Label.kt rename to src/main/kotlin/net/shadowfacts/cacao/view/Label.kt index 6c48277..798e930 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/view/Label.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/view/Label.kt @@ -1,9 +1,9 @@ -package net.shadowfacts.shadowui.view +package net.shadowfacts.cacao.view import net.minecraft.client.MinecraftClient import net.minecraft.client.font.TextRenderer -import net.shadowfacts.shadowui.geometry.Size -import net.shadowfacts.shadowui.util.Color +import net.shadowfacts.cacao.geometry.Size +import net.shadowfacts.cacao.util.Color /** * @author shadowfacts diff --git a/src/main/kotlin/net/shadowfacts/shadowui/view/StackView.kt b/src/main/kotlin/net/shadowfacts/cacao/view/StackView.kt similarity index 90% rename from src/main/kotlin/net/shadowfacts/shadowui/view/StackView.kt rename to src/main/kotlin/net/shadowfacts/cacao/view/StackView.kt index 5bc107c..dad2c46 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/view/StackView.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/view/StackView.kt @@ -1,10 +1,10 @@ -package net.shadowfacts.shadowui.view +package net.shadowfacts.cacao.view import net.shadowfacts.kiwidsl.dsl -import net.shadowfacts.shadowui.LayoutVariable -import net.shadowfacts.shadowui.geometry.Axis -import net.shadowfacts.shadowui.geometry.AxisPosition -import net.shadowfacts.shadowui.geometry.AxisPosition.* +import net.shadowfacts.cacao.LayoutVariable +import net.shadowfacts.cacao.geometry.Axis +import net.shadowfacts.cacao.geometry.AxisPosition +import net.shadowfacts.cacao.geometry.AxisPosition.* import no.birkett.kiwi.Constraint /** diff --git a/src/main/kotlin/net/shadowfacts/shadowui/view/View.kt b/src/main/kotlin/net/shadowfacts/cacao/view/View.kt similarity index 90% rename from src/main/kotlin/net/shadowfacts/shadowui/view/View.kt rename to src/main/kotlin/net/shadowfacts/cacao/view/View.kt index 341bf39..d488d4c 100644 --- a/src/main/kotlin/net/shadowfacts/shadowui/view/View.kt +++ b/src/main/kotlin/net/shadowfacts/cacao/view/View.kt @@ -1,14 +1,14 @@ -package net.shadowfacts.shadowui.view +package net.shadowfacts.cacao.view import com.mojang.blaze3d.platform.GlStateManager import net.shadowfacts.kiwidsl.dsl -import net.shadowfacts.shadowui.LayoutVariable -import net.shadowfacts.shadowui.geometry.Axis -import net.shadowfacts.shadowui.geometry.AxisPosition -import net.shadowfacts.shadowui.geometry.Rect -import net.shadowfacts.shadowui.geometry.Size -import net.shadowfacts.shadowui.util.Color -import net.shadowfacts.shadowui.util.RenderHelper +import net.shadowfacts.cacao.LayoutVariable +import net.shadowfacts.cacao.geometry.Axis +import net.shadowfacts.cacao.geometry.AxisPosition +import net.shadowfacts.cacao.geometry.Rect +import net.shadowfacts.cacao.geometry.Size +import net.shadowfacts.cacao.util.Color +import net.shadowfacts.cacao.util.RenderHelper import no.birkett.kiwi.Constraint import no.birkett.kiwi.Solver diff --git a/src/main/kotlin/net/shadowfacts/shadowui/geometry/Size.kt b/src/main/kotlin/net/shadowfacts/shadowui/geometry/Size.kt deleted file mode 100644 index e0a7842..0000000 --- a/src/main/kotlin/net/shadowfacts/shadowui/geometry/Size.kt +++ /dev/null @@ -1,6 +0,0 @@ -package net.shadowfacts.shadowui.geometry - -/** - * @author shadowfacts - */ -data class Size(val width: Double, val height: Double) \ No newline at end of file diff --git a/src/test/kotlin/net/shadowfacts/shadowui/WindowTests.kt b/src/test/kotlin/net/shadowfacts/cacao/WindowTests.kt similarity index 93% rename from src/test/kotlin/net/shadowfacts/shadowui/WindowTests.kt rename to src/test/kotlin/net/shadowfacts/cacao/WindowTests.kt index 5643029..a0f5b8a 100644 --- a/src/test/kotlin/net/shadowfacts/shadowui/WindowTests.kt +++ b/src/test/kotlin/net/shadowfacts/cacao/WindowTests.kt @@ -1,8 +1,8 @@ -package net.shadowfacts.shadowui +package net.shadowfacts.cacao import net.shadowfacts.kiwidsl.dsl -import net.shadowfacts.shadowui.geometry.Size -import net.shadowfacts.shadowui.view.View +import net.shadowfacts.cacao.geometry.Size +import net.shadowfacts.cacao.view.View import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/net/shadowfacts/shadowui/geometry/RectTest.kt b/src/test/kotlin/net/shadowfacts/cacao/geometry/RectTest.kt similarity index 94% rename from src/test/kotlin/net/shadowfacts/shadowui/geometry/RectTest.kt rename to src/test/kotlin/net/shadowfacts/cacao/geometry/RectTest.kt index 17c6ee7..41e4e91 100644 --- a/src/test/kotlin/net/shadowfacts/shadowui/geometry/RectTest.kt +++ b/src/test/kotlin/net/shadowfacts/cacao/geometry/RectTest.kt @@ -1,4 +1,4 @@ -package net.shadowfacts.shadowui.geometry +package net.shadowfacts.cacao.geometry import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/net/shadowfacts/shadowui/util/ColorTest.kt b/src/test/kotlin/net/shadowfacts/cacao/util/ColorTest.kt similarity index 91% rename from src/test/kotlin/net/shadowfacts/shadowui/util/ColorTest.kt rename to src/test/kotlin/net/shadowfacts/cacao/util/ColorTest.kt index c26c43c..e63c1a4 100644 --- a/src/test/kotlin/net/shadowfacts/shadowui/util/ColorTest.kt +++ b/src/test/kotlin/net/shadowfacts/cacao/util/ColorTest.kt @@ -1,4 +1,4 @@ -package net.shadowfacts.shadowui.util +package net.shadowfacts.cacao.util import org.junit.jupiter.api.Assertions.* import org.junit.jupiter.api.Test diff --git a/src/test/kotlin/net/shadowfacts/shadowui/view/StackViewTests.kt b/src/test/kotlin/net/shadowfacts/cacao/view/StackViewTests.kt similarity index 96% rename from src/test/kotlin/net/shadowfacts/shadowui/view/StackViewTests.kt rename to src/test/kotlin/net/shadowfacts/cacao/view/StackViewTests.kt index 0efe2b6..37c1cb9 100644 --- a/src/test/kotlin/net/shadowfacts/shadowui/view/StackViewTests.kt +++ b/src/test/kotlin/net/shadowfacts/cacao/view/StackViewTests.kt @@ -1,9 +1,9 @@ -package net.shadowfacts.shadowui.view +package net.shadowfacts.cacao.view import net.shadowfacts.kiwidsl.dsl -import net.shadowfacts.shadowui.Window -import net.shadowfacts.shadowui.geometry.Axis -import net.shadowfacts.shadowui.geometry.Size +import net.shadowfacts.cacao.Window +import net.shadowfacts.cacao.geometry.Axis +import net.shadowfacts.cacao.geometry.Size import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test