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

Localize block and param names

This commit is contained in:
Shadowfacts 2019-08-10 19:21:26 -04:00
parent 6045800d11
commit e79c0dd6f7
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
10 changed files with 57 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/kotlin/net/shadowfacts/asmr/program/ExecutableBlock.kt
View File

@ -1,9 +1,11 @@
package net.shadowfacts.asmr.program package net.shadowfacts.asmr.program
import net.minecraft.util.Identifier
/** /**
* @author shadowfacts * @author shadowfacts
*/ */
abstract class ExecutableBlock: ProgramBlock() { abstract class ExecutableBlock(identifier: Identifier): ProgramBlock(identifier) {
open val executionFlow = ExecutionFlow(this) open val executionFlow = ExecutionFlow(this)

8
src/main/kotlin/net/shadowfacts/asmr/program/ProgramBlock.kt
View File

@ -1,15 +1,21 @@
package net.shadowfacts.asmr.program package net.shadowfacts.asmr.program
import net.minecraft.util.Identifier
import net.minecraft.util.Language
import net.shadowfacts.cacao.geometry.Point import net.shadowfacts.cacao.geometry.Point
/** /**
* @author shadowfacts * @author shadowfacts
*/ */
abstract class ProgramBlock { abstract class ProgramBlock(val identifier: Identifier) {
var position: Point = Point.ORIGIN var position: Point = Point.ORIGIN
abstract val inputs: Array<ProgramBlockInput<*>> abstract val inputs: Array<ProgramBlockInput<*>>
abstract val outputs: Array<ProgramBlockOutput<*>> abstract val outputs: Array<ProgramBlockOutput<*>>
fun translateName(): String {
return Language.getInstance().translate("programblock.${identifier.namespace}.${identifier.path}")
}
} }

5
src/main/kotlin/net/shadowfacts/asmr/program/ProgramBlockInput.kt
View File

@ -1,6 +1,7 @@
package net.shadowfacts.asmr.program package net.shadowfacts.asmr.program
import net.minecraft.util.Identifier import net.minecraft.util.Identifier
import net.minecraft.util.Language
/** /**
* @author shadowfacts * @author shadowfacts
@ -26,4 +27,8 @@ class ProgramBlockInput<Type: Any>(
source?.unlink(to = this) source?.unlink(to = this)
} }
fun translateName(): String {
return Language.getInstance().translate("programblock.param.${identifier.namespace}.${identifier.path}")
}
} }

5
src/main/kotlin/net/shadowfacts/asmr/program/ProgramBlockOutput.kt
View File

@ -1,6 +1,7 @@
package net.shadowfacts.asmr.program package net.shadowfacts.asmr.program
import net.minecraft.util.Identifier import net.minecraft.util.Identifier
import net.minecraft.util.Language
/** /**
* @author shadowfacts * @author shadowfacts
@ -26,4 +27,8 @@ class ProgramBlockOutput<Type: Any>(
_destinations.remove(to) _destinations.remove(to)
} }
fun translateName(): String {
return Language.getInstance().translate("programblock.param.${identifier.namespace}.${identifier.path}")
}
} }

6
src/main/kotlin/net/shadowfacts/asmr/program/blocks/ConstantBlock.kt
View File

@ -13,9 +13,11 @@ import net.shadowfacts.asmr.program.ProgramType
class ConstantBlock<Type: Any>( class ConstantBlock<Type: Any>(
val type: ProgramType<Type>, val type: ProgramType<Type>,
val value: Type val value: Type
): ProgramBlock() { ): ProgramBlock(
Identifier(ASMR.modid, "constant")
) {
val output = ProgramBlockOutput(Identifier(ASMR.modid, "constant_output"), type, this).apply { val output = ProgramBlockOutput(Identifier(ASMR.modid, "constant.output"), type, this).apply {
value = this@ConstantBlock.value value = this@ConstantBlock.value
} }

6
src/main/kotlin/net/shadowfacts/asmr/program/blocks/PrintBlock.kt
View File

@ -10,9 +10,11 @@ import net.shadowfacts.cacao.geometry.Point
*/ */
class PrintBlock<Type: Any>( class PrintBlock<Type: Any>(
val type: ProgramType<Type> val type: ProgramType<Type>
): ExecutableBlock() { ): ExecutableBlock(
Identifier(ASMR.modid, "print")
) {
val input = ProgramBlockInput(Identifier(ASMR.modid, "print_input"), type, this) val input = ProgramBlockInput(Identifier(ASMR.modid, "print.input"), type, this)
override val inputs: Array<ProgramBlockInput<*>> = arrayOf(input) override val inputs: Array<ProgramBlockInput<*>> = arrayOf(input)
override val outputs: Array<ProgramBlockOutput<*>> = arrayOf() override val outputs: Array<ProgramBlockOutput<*>> = arrayOf()

6
src/main/kotlin/net/shadowfacts/asmr/program/blocks/StartBlock.kt
View File

@ -1,5 +1,7 @@
package net.shadowfacts.asmr.program.blocks package net.shadowfacts.asmr.program.blocks
import net.minecraft.util.Identifier
import net.shadowfacts.asmr.ASMR
import net.shadowfacts.asmr.program.ExecutableBlock import net.shadowfacts.asmr.program.ExecutableBlock
import net.shadowfacts.asmr.program.ProgramBlockInput import net.shadowfacts.asmr.program.ProgramBlockInput
import net.shadowfacts.asmr.program.ProgramBlockOutput import net.shadowfacts.asmr.program.ProgramBlockOutput
@ -7,7 +9,9 @@ import net.shadowfacts.asmr.program.ProgramBlockOutput
/** /**
* @author shadowfacts * @author shadowfacts
*/ */
class StartBlock: ExecutableBlock() { class StartBlock: ExecutableBlock(
Identifier(ASMR.modid, "start")
) {
override val inputs: Array<ProgramBlockInput<*>> = arrayOf() override val inputs: Array<ProgramBlockInput<*>> = arrayOf()
override val outputs: Array<ProgramBlockOutput<*>> = arrayOf() override val outputs: Array<ProgramBlockOutput<*>> = arrayOf()

10
src/main/kotlin/net/shadowfacts/asmr/program/blocks/math/BinaryOperatorBlock.kt
View File

@ -14,7 +14,9 @@ import java.lang.RuntimeException
class BinaryOperatorBlock<Type: Any>( class BinaryOperatorBlock<Type: Any>(
val type: ProgramType<Type>, val type: ProgramType<Type>,
val operation: Operation val operation: Operation
): ExecutableBlock() { ): ExecutableBlock(
Identifier(ASMR.modid, "binary_operator")
) {
init { init {
if (type != ProgramType.INT && type != ProgramType.FLOAT) { if (type != ProgramType.INT && type != ProgramType.FLOAT) {
@ -22,10 +24,10 @@ class BinaryOperatorBlock<Type: Any>(
} }
} }
val left = ProgramBlockInput(Identifier(ASMR.modid, "left_operand"), type, this) val left = ProgramBlockInput(Identifier(ASMR.modid, "binary_operator.left_operand"), type, this)
val right = ProgramBlockInput(Identifier(ASMR.modid, "right_operand"), type, this) val right = ProgramBlockInput(Identifier(ASMR.modid, "binary_operator.right_operand"), type, this)
val output = ProgramBlockOutput(Identifier(ASMR.modid, "result"), type, this) val output = ProgramBlockOutput(Identifier(ASMR.modid, "binary_operator.result"), type, this)
override val inputs: Array<ProgramBlockInput<*>> = arrayOf(left, right) override val inputs: Array<ProgramBlockInput<*>> = arrayOf(left, right)
override val outputs: Array<ProgramBlockOutput<*>> = arrayOf(output) override val outputs: Array<ProgramBlockOutput<*>> = arrayOf(output)

47
src/main/kotlin/net/shadowfacts/asmr/ui/ProgramBlockView.kt
View File

@ -48,7 +48,7 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri
zIndex = 10.0 zIndex = 10.0
val titleStack = addArrangedSubview(StackView(Axis.HORIZONTAL, Distribution.CENTER)) val titleStack = addArrangedSubview(StackView(Axis.HORIZONTAL, Distribution.CENTER))
val title = titleStack.addArrangedSubview(Label(block.javaClass.simpleName)) val title = titleStack.addArrangedSubview(Label(block.translateName()))
if (block is ExecutableBlock) { if (block is ExecutableBlock) {
val incomingTexture = if (block.executionFlow.prev == null) emptyConnection else executionConnection val incomingTexture = if (block.executionFlow.prev == null) emptyConnection else executionConnection
incomingExecution = titleStack.addArrangedSubview(TextureView(incomingTexture), index = 0) incomingExecution = titleStack.addArrangedSubview(TextureView(incomingTexture), index = 0)
@ -67,21 +67,16 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri
outgoingExeuction!!.widthAnchor equalTo outgoingExeuction!!.heightAnchor outgoingExeuction!!.widthAnchor equalTo outgoingExeuction!!.heightAnchor
outgoingExeuction!!.widthAnchor equalTo 7 outgoingExeuction!!.widthAnchor equalTo 7
} }
// for (paramView in inputViews.values) {
// paramView.widthAnchor equalTo paramView.heightAnchor
// paramView.widthAnchor equalTo 7
// }
} }
for (i in 0 until max(block.inputs.size, block.outputs.size)) { for (i in 0 until max(block.inputs.size, block.outputs.size)) {
val hStack = addArrangedSubview(StackView(Axis.HORIZONTAL, Distribution.CENTER)) val hStack = addArrangedSubview(StackView(Axis.HORIZONTAL, Distribution.CENTER))
block.inputs.getOrNull(i)?.let { input -> block.inputs.getOrNull(i)?.let { input ->
val inputView = hStack.addArrangedSubview(TextureView(if (input.source == null) emptyConnection else parameterConnection)) val inputTexture = if (input.source == null) emptyConnection else parameterConnection
val inputView = hStack.addArrangedSubview(TextureView(inputTexture))
inputViews[input] = inputView inputViews[input] = inputView
val inputLabel = hStack.addArrangedSubview(Label(input.identifier.toString())) val inputLabel = hStack.addArrangedSubview(Label(input.translateName()))
solver.dsl { solver.dsl {
hStack.heightAnchor equalTo inputLabel.heightAnchor hStack.heightAnchor equalTo inputLabel.heightAnchor
@ -96,8 +91,9 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri
} }
block.outputs.getOrNull(i)?.let { output -> block.outputs.getOrNull(i)?.let { output ->
val outputLabel = hStack.addArrangedSubview(Label(output.identifier.toString(), textAlignment = Label.TextAlignment.RIGHT)) val outputLabel = hStack.addArrangedSubview(Label(output.translateName(), textAlignment = Label.TextAlignment.RIGHT))
val outputView = hStack.addArrangedSubview(TextureView(if (output.destinations.isEmpty()) emptyConnection else parameterConnection)) val outputTexture = if (output.destinations.isEmpty()) emptyConnection else parameterConnection
val outputView = hStack.addArrangedSubview(TextureView(outputTexture))
outputViews[output] = outputView outputViews[output] = outputView
solver.dsl { solver.dsl {
hStack.heightAnchor equalTo outputLabel.heightAnchor hStack.heightAnchor equalTo outputLabel.heightAnchor
@ -108,35 +104,6 @@ class ProgramBlockView(val block: ProgramBlock): StackView(Axis.VERTICAL, Distri
} }
} }
// val pairs = block.inputs.zip(block.outputs)
// val remainingInputs = if (block.inputs.size > block.outputs.size) block.inputs.drop(block.outputs.size) else listOf()
// val remainingOutputs = if (block.outputs.size > block.inputs.size) block.outputs.drop(block.inputs.size) else listOf()
// for ((input, output) in pairs) {
// val hStack = addArrangedSubview(StackView(Axis.HORIZONTAL, Distribution.CENTER))
// val inputView = hStack.addArrangedSubview(TextureView(if (input.source == null) emptyConnection else parameterConnection))
// inputViews[input] = inputView
// val inputLabel = hStack.addArrangedSubview(Label(input.identifier.toString()))
// val spacingView = hStack.addArrangedSubview(View())
// hStack.addArrangedSubview(Label(output.identifier.toString()))
//// outputViews[output] = hStack.addArrangedSubview(TextureView(if (output.destinations.isEmpty) emptyConnection else parameterConnection))
//
// solver.dsl {
// hStack.heightAnchor equalTo inputLabel.heightAnchor
//
// inputView.widthAnchor equalTo inputView.heightAnchor
// inputView.widthAnchor equalTo 7
//
// spacingView.widthAnchor equalTo 8
// }
// }
// for (input in remainingInputs) {
// addArrangedSubview(Label(input.identifier.toString()))
// }
// for (output in remainingOutputs) {
// addArrangedSubview(Label(output.identifier.toString(), textAlignment = Label.TextAlignment.RIGHT))
// }
solver.dsl { solver.dsl {
for (view in arrangedSubviews.drop(1)) { for (view in arrangedSubviews.drop(1)) {
widthAnchor.equalTo(view.widthAnchor, strength = STRONG) widthAnchor.equalTo(view.widthAnchor, strength = STRONG)

11
src/main/resources/assets/asmr/lang/en_us.json Normal file
View File

@ -0,0 +1,11 @@
{
"programblock.asmr.start": "Start",
"programblock.asmr.constant": "Constant",
"programblock.param.asmr.constant.output": "Output",
"programblock.asmr.print": "Print",
"programblock.param.asmr.print.input": "Print Value",
"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"
}