minecraft
/
ASMR
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Update to latest Fabric/Yarn

This commit is contained in:
Shadowfacts 2019-08-08 15:41:40 -04:00
parent e4fc677dc1
commit 6c0150e79a
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build.gradle.kts
View File

@ -20,10 +20,10 @@ base {
group = "net.shadowfacts" group = "net.shadowfacts"
version = "0.1.0" version = "0.1.0"
val minecraftVersion = "1.14.2" val minecraftVersion = "1.14.4"
val yarnMappings = "1.14.2+build.7" val yarnMappings = "1.14.4+build.9"
val loaderVersion = "0.4.8+build.155" val loaderVersion = "0.4.8+build.159"
val fabricVersion = "0.3.0+build.185" val fabricVersion = "0.3.1+build.208"
val fabricKotlinVersion = "1.3.40+build.1" val fabricKotlinVersion = "1.3.40+build.1"
val junitVersion = "5.4.0" val junitVersion = "5.4.0"

4
src/main/kotlin/net/shadowfacts/cacao/CacaoScreen.kt
View File

@ -2,8 +2,8 @@ package net.shadowfacts.cacao
import net.minecraft.client.MinecraftClient import net.minecraft.client.MinecraftClient
import net.minecraft.client.gui.screen.Screen import net.minecraft.client.gui.screen.Screen
import net.minecraft.network.chat.TextComponent
import net.minecraft.sound.SoundEvents import net.minecraft.sound.SoundEvents
import net.minecraft.text.LiteralText
import net.shadowfacts.cacao.geometry.Point import net.shadowfacts.cacao.geometry.Point
import net.shadowfacts.cacao.util.MouseButton import net.shadowfacts.cacao.util.MouseButton
import net.shadowfacts.cacao.util.RenderHelper import net.shadowfacts.cacao.util.RenderHelper
@ -16,7 +16,7 @@ import java.util.*
* *
* @author shadowfacts * @author shadowfacts
*/ */
open class CacaoScreen: Screen(TextComponent("CacaoScreen")) { open class CacaoScreen: Screen(LiteralText("CacaoScreen")) {
// _windows is the internal, mutable object, since we only want it to by mutated by the add/removeWindow methods. // _windows is the internal, mutable object, since we only want it to by mutated by the add/removeWindow methods.
private val _windows = LinkedList<Window>() private val _windows = LinkedList<Window>()

3
src/main/kotlin/net/shadowfacts/cacao/view/DialogView.kt
View File

@ -1,6 +1,5 @@
package net.shadowfacts.cacao.view package net.shadowfacts.cacao.view
import net.minecraft.ChatFormat
import net.shadowfacts.cacao.Window import net.shadowfacts.cacao.Window
import net.shadowfacts.cacao.geometry.Axis import net.shadowfacts.cacao.geometry.Axis
import net.shadowfacts.cacao.util.Color import net.shadowfacts.cacao.util.Color
@ -50,7 +49,7 @@ class DialogView(
vStack = hStack.addArrangedSubview(StackView(Axis.VERTICAL, spacing = 4.0)) vStack = hStack.addArrangedSubview(StackView(Axis.VERTICAL, spacing = 4.0))
vStack.addArrangedSubview(Label(ChatFormat.BOLD.toString() + title, shadow = false).apply { vStack.addArrangedSubview(Label(title, shadow = false).apply {
textColor = Color(0x404040) textColor = Color(0x404040)
}) })
messageLabel = vStack.addArrangedSubview(Label(message, shadow = false).apply { messageLabel = vStack.addArrangedSubview(Label(message, shadow = false).apply {