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

Compare commits

base: minecraft:aa9181cfeaf68d4cde0c42dff561f92805247ede
Branches Tags
minecraft:master
..
compare: minecraft:34dba8678819b0c536f9767774ddf04ca0324ad3
Branches Tags
minecraft:master

No commits in common. "aa9181cfeaf68d4cde0c42dff561f92805247ede" and "34dba8678819b0c536f9767774ddf04ca0324ad3" have entirely different histories.
aa9181cfea ... 34dba86788

5 changed files with 3 additions and 48 deletions
Show Stats Expand all files Collapse all files

4
src/main/kotlin/net/shadowfacts/asmr/manager/ManagerBlock.kt
View File

@ -35,9 +35,7 @@ class ManagerBlock: Block(Settings.of(Material.METAL)), BlockEntityProvider {
@Environment(EnvType.CLIENT)
private fun openManagerUI(managerBlockEntity: ManagerBlockEntity) {
val vc = ManagerViewController(managerBlockEntity)
val screen = object: CacaoScreen() {
override fun isPauseScreen() = false
}
val screen = CacaoScreen()
try {
val window = screen.addWindow(Window(vc))
MinecraftClient.getInstance().openScreen(screen)

3
src/main/kotlin/net/shadowfacts/asmr/manager/ManagerBlockEntity.kt
View File

@ -4,7 +4,6 @@ import net.minecraft.block.entity.BlockEntity
import net.shadowfacts.asmr.ASMR
import net.shadowfacts.asmr.program.Program
import net.shadowfacts.asmr.program.ProgramType.Companion.INT
import net.shadowfacts.asmr.program.blocks.ChatBlock
import net.shadowfacts.asmr.program.blocks.ConstantBlock
import net.shadowfacts.asmr.program.blocks.PrintBlock
import net.shadowfacts.asmr.program.blocks.math.BinaryOperatorBlock
@ -30,7 +29,7 @@ class ManagerBlockEntity: BlockEntity(ASMR.managerEntityType) {
// it.right.link(from = right.output)
it.position = Point(120.0, 0.0)
}
val print = program.addBlock(ChatBlock(INT)) {
val print = program.addBlock(PrintBlock(INT)) {
// it.input.link(from = divide.output)
it.position = Point(240.0, 0.0)
}

30
src/main/kotlin/net/shadowfacts/asmr/program/blocks/ChatBlock.kt
View File

@ -1,30 +0,0 @@
package net.shadowfacts.asmr.program.blocks
import net.minecraft.client.MinecraftClient
import net.minecraft.text.LiteralText
import net.minecraft.util.Identifier
import net.shadowfacts.asmr.ASMR
import net.shadowfacts.asmr.program.ProgramBlockInput
import net.shadowfacts.asmr.program.ProgramBlockOutput
import net.shadowfacts.asmr.program.ProgramType
import net.shadowfacts.asmr.program.execution.SimpleExecutableBlock
/**
* @author shadowfacts
*/
class ChatBlock<Type: Any>(
val type: ProgramType<Type>
): SimpleExecutableBlock(
Identifier(ASMR.modid, "chat")
) {
val input = ProgramBlockInput(Identifier(ASMR.modid, "chat.input"), type, this)
override val inputs: Array<ProgramBlockInput<*>> = arrayOf(input)
override val outputs: Array<ProgramBlockOutput<*>> = arrayOf()
override fun execute() {
MinecraftClient.getInstance().player.sendMessage(LiteralText(input.value.toString()))
}
}

10
src/main/kotlin/net/shadowfacts/asmr/ui/ManagerViewController.kt
View File

@ -8,7 +8,6 @@ import net.shadowfacts.cacao.util.texture.NinePatchTexture
import net.shadowfacts.cacao.view.Label
import net.shadowfacts.cacao.view.NinePatchView
import net.shadowfacts.cacao.view.View
import net.shadowfacts.cacao.view.button.Button
import net.shadowfacts.cacao.viewcontroller.ViewController
/**
@ -23,12 +22,6 @@ class ManagerViewController(val managerBlockEntity: ManagerBlockEntity): ViewCon
val background = panel.addSubview(NinePatchView(NinePatchTexture.PANEL_BG))
val label = panel.addSubview(Label("test label"))
val canvas = panel.addSubview(ProgramCanvasView(managerBlockEntity.program))
val runButton = panel.addSubview(Button(Label("Run"))).apply {
zIndex = 10.0
handler = {
managerBlockEntity.program.execute()
}
}
createConstraints {
panel.widthAnchor equalTo (view.widthAnchor - 20)
@ -48,9 +41,6 @@ class ManagerViewController(val managerBlockEntity: ManagerBlockEntity): ViewCon
canvas.heightAnchor equalTo (panel.heightAnchor - 8)
canvas.centerXAnchor equalTo panel.centerXAnchor
canvas.centerYAnchor equalTo panel.centerYAnchor
runButton.topAnchor equalTo panel.topAnchor
runButton.rightAnchor equalTo panel.rightAnchor
}
}

4
src/main/resources/assets/asmr/lang/en_us.json
View File

@ -9,7 +9,5 @@
"programblock.asmr.binary_operator": "Binary Math Operator",
"programblock.param.asmr.binary_operator.left_operand": "Left Operand",
"programblock.param.asmr.binary_operator.right_operand": "Right Operand",
"programblock.param.asmr.binary_operator.result": "Result",
"programblock.asmr.chat": "Chat",
"programblock.param.asmr.chat.input": "Chat Value"
"programblock.param.asmr.binary_operator.result": "Result"
}