1.18.2
This commit is contained in:
parent
e88ecd3215
commit
9200dea350
|
@ -1,5 +1,5 @@
|
|||
plugins {
|
||||
id "fabric-loom" version "0.10-SNAPSHOT"
|
||||
id "fabric-loom" version "0.12.9"
|
||||
id "maven-publish"
|
||||
id "org.jetbrains.kotlin.jvm" version "1.6.10"
|
||||
}
|
||||
|
|
|
@ -1,21 +1,21 @@
|
|||
org.gradle.jvmargs=-Xmx1G
|
||||
org.gradle.daemon=false
|
||||
|
||||
minecraft_version=1.18.1
|
||||
yarn_mappings=1.18.1+build.7
|
||||
loader_version=0.12.12
|
||||
minecraft_version=1.18.2
|
||||
yarn_mappings=1.18.2+build.3
|
||||
loader_version=0.14.8
|
||||
|
||||
mod_version=0.2.0
|
||||
maven_group=net.shadowfacts
|
||||
archives_base_name=PhysicalConnectivity
|
||||
|
||||
fabric_version=0.44.0+1.18
|
||||
fabric_kotlin_version=1.7.1+kotlin.1.6.10
|
||||
fabric_version=0.56.0+1.18.2
|
||||
fabric_kotlin_version=1.8.0+kotlin.1.7.0
|
||||
|
||||
libblockattributes_version=0.10.0
|
||||
libblockattributes_version=0.10.2
|
||||
# cotton_resources_version=1.7.4
|
||||
modmenu_version=3.0.1
|
||||
rei_version=7.1.356
|
||||
mousewheelie_version=1.8.0+mc1.18-pre5
|
||||
modmenu_version=3.2.2
|
||||
rei_version=8.2.481
|
||||
mousewheelie_version=1.9.0+mc1.18.2
|
||||
|
||||
junit_version = 5.4.0
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
"fabric": "*",
|
||||
"fabric-language-kotlin": ">=1.3.50",
|
||||
"phycon": "*",
|
||||
"roughlyenoughitems": "^7.0.0"
|
||||
"roughlyenoughitems": ["^7.0.0", "^8.0.0"]
|
||||
},
|
||||
|
||||
"custom": {
|
||||
|
|
|
@ -57,7 +57,7 @@ open class CacaoHandledScreen<Handler: ScreenHandler>(
|
|||
override fun removeWindow(window: Window) {
|
||||
_windows.remove(window)
|
||||
if (windows.isEmpty()) {
|
||||
onClose()
|
||||
close()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -75,8 +75,8 @@ open class CacaoHandledScreen<Handler: ScreenHandler>(
|
|||
}
|
||||
}
|
||||
|
||||
override fun onClose() {
|
||||
super.onClose()
|
||||
override fun close() {
|
||||
super.close()
|
||||
|
||||
windows.forEach {
|
||||
it.viewController.viewWillDisappear()
|
||||
|
|
|
@ -69,7 +69,7 @@ open class CacaoScreen(title: Text = LiteralText("CacaoScreen")): Screen(title),
|
|||
override fun removeWindow(window: Window) {
|
||||
_windows.remove(window)
|
||||
if (windows.isEmpty()) {
|
||||
onClose()
|
||||
close()
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -87,8 +87,8 @@ open class CacaoScreen(title: Text = LiteralText("CacaoScreen")): Screen(title),
|
|||
}
|
||||
}
|
||||
|
||||
override fun onClose() {
|
||||
super.onClose()
|
||||
override fun close() {
|
||||
super.close()
|
||||
|
||||
windows.forEach {
|
||||
it.viewController.viewWillDisappear()
|
||||
|
|
|
@ -38,7 +38,6 @@ class CableBlock(
|
|||
FabricBlockSettings.of(CABLE_MATERIAL)
|
||||
.strength(0.3f)
|
||||
.nonOpaque()
|
||||
.breakByHand(true)
|
||||
), NetworkCableBlock {
|
||||
companion object {
|
||||
val ID = Identifier(PhysicalConnectivity.MODID, "cable")
|
||||
|
|
|
@ -118,11 +118,11 @@ class DeviceConsoleScreen(
|
|||
addWindow(Window(root))
|
||||
}
|
||||
|
||||
override fun isPauseScreen() = false
|
||||
override fun shouldPause() = false
|
||||
|
||||
override fun keyPressed(keyCode: Int, scanCode: Int, modifiers: Int): Boolean {
|
||||
if (keyCode == GLFW.GLFW_KEY_E) {
|
||||
onClose()
|
||||
close()
|
||||
return true
|
||||
}
|
||||
return super.keyPressed(keyCode, scanCode, modifiers)
|
||||
|
|
Loading…
Reference in New Issue