Skip to content

Add T4 components to /oc_sc computer and creative template #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Daydrain wants to merge 4 commits into
base: main-MC1.21.1
Choose a base branch
from
Open

Add T4 components to /oc_sc computer and creative template #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71ab89b
update OC_SC command to add T4
Daydrain Aug 22, 2026
f6e3f82
add T4 in creative template
Daydrain Aug 22, 2026
6ef7986
add argument on the /os_sc command (no default one) to select screen …
Daydrain Aug 23, 2026
d5a7a0f
Merge branch 'main-MC1.21.1' into feature/oc_sc-command-T4-update
Daydrain Aug 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 24 additions & 23 deletions src/main/scala/li/cil/oc/common/template/DroneTemplate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import net.minecraft.world.item.ItemStack

import scala.collection.JavaConverters.asJavaIterable
import scala.collection.convert.ImplicitConversionsToJava._
import scala.jdk.CollectionConverters.IterableHasAsJava

object DroneTemplate extends Template {
override protected val suggestedComponents = Array(
Expand Down Expand Up @@ -68,15 +69,15 @@ object DroneTemplate extends Template {
Tier.Two,
Tier.One
),
asJavaIterable(Iterable(
Iterable(
(Slot.Card, Tier.Two),
(Slot.Card, Tier.One),
null,
(Slot.CPU, Tier.One),
(Slot.Memory, Tier.One),
null,
(Slot.EEPROM, Tier.Any)
).map(toPair)))
).map(toPair).asJava)

// Tier 2
api.IMC.registerAssemblerTemplate(
Expand All @@ -91,15 +92,15 @@ object DroneTemplate extends Template {
Tier.Two,
Tier.One
),
asJavaIterable(Iterable(
Iterable(
(Slot.Card, Tier.Two),
(Slot.Card, Tier.Two),
null,
(Slot.CPU, Tier.One),
(Slot.Memory, Tier.One),
(Slot.Memory, Tier.One),
(Slot.EEPROM, Tier.Any)
).map(toPair)))
).map(toPair).asJava)

// Tier 2
api.IMC.registerAssemblerTemplate(
Expand All @@ -115,15 +116,15 @@ object DroneTemplate extends Template {
Tier.Two,
Tier.One
),
asJavaIterable(Iterable(
Iterable(
(Slot.Card, Tier.Three),
(Slot.Card, Tier.Two),
null,
(Slot.CPU, Tier.One),
(Slot.Memory, Tier.Two),
(Slot.Memory, Tier.One),
(Slot.EEPROM, Tier.Any)
).map(toPair)))
).map(toPair).asJava)

// Creative
api.IMC.registerAssemblerTemplate(
Expand All @@ -134,25 +135,25 @@ object DroneTemplate extends Template {
hostClass,
null,
Array(
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four
),
asJavaIterable(Iterable(
(Slot.Card, Tier.Three),
(Slot.Card, Tier.Three),
(Slot.Card, Tier.Three),
(Slot.CPU, Tier.Three),
(Slot.Memory, Tier.Three),
(Slot.Memory, Tier.Three),
Iterable(
(Slot.Card, Tier.Four),
(Slot.Card, Tier.Four),
(Slot.Card, Tier.Four),
(Slot.CPU, Tier.Four),
(Slot.Memory, Tier.Four),
(Slot.Memory, Tier.Four),
(Slot.EEPROM, Tier.Any)
).map(toPair)))
).map(toPair).asJava)

// Disassembler
api.IMC.registerDisassemblerTemplate(
Expand Down
51 changes: 26 additions & 25 deletions src/main/scala/li/cil/oc/common/template/MicrocontrollerTemplate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import net.minecraft.world.item.ItemStack

import scala.collection.JavaConverters.asJavaIterable
import scala.collection.convert.ImplicitConversionsToJava._
import scala.jdk.CollectionConverters.IterableHasAsJava

object MicrocontrollerTemplate extends Template {
override protected val suggestedComponents = Array(
Expand All @@ -24,7 +25,7 @@ object MicrocontrollerTemplate extends Template {
def selectTier1(stack: ItemStack): Boolean = api.Items.get(stack) == api.Items.get(Constants.ItemName.MicrocontrollerCaseTier1)

def selectTier2(stack: ItemStack): Boolean = api.Items.get(stack) == api.Items.get(Constants.ItemName.MicrocontrollerCaseTier2)

def selectTier3(stack: ItemStack): Boolean = api.Items.get(stack) == api.Items.get(Constants.ItemName.MicrocontrollerCaseTier3)

def selectTierCreative(stack: ItemStack): Boolean = api.Items.get(stack) == api.Items.get(Constants.ItemName.MicrocontrollerCaseCreative)
Expand Down Expand Up @@ -64,15 +65,15 @@ object MicrocontrollerTemplate extends Template {
Array(
Tier.Two
),
asJavaIterable(Iterable(
Iterable(
(Slot.Card, Tier.One),
(Slot.Card, Tier.One),
null,
(Slot.CPU, Tier.One),
(Slot.Memory, Tier.One),
null,
(Slot.EEPROM, Tier.Any)
).map(toPair)))
).map(toPair).asJava)

// Tier 2
api.IMC.registerAssemblerTemplate(
Expand All @@ -85,15 +86,15 @@ object MicrocontrollerTemplate extends Template {
Array(
Tier.Three
),
asJavaIterable(Iterable(
Iterable(
(Slot.Card, Tier.Two),
(Slot.Card, Tier.One),
null,
(Slot.CPU, Tier.One),
(Slot.Memory, Tier.One),
(Slot.Memory, Tier.One),
(Slot.EEPROM, Tier.Any)
).map(toPair)))
).map(toPair).asJava)

// Tier 3
api.IMC.registerAssemblerTemplate(
Expand All @@ -106,16 +107,16 @@ object MicrocontrollerTemplate extends Template {
Array(
Tier.Four
),
asJavaIterable(Iterable(
Iterable(
(Slot.Card, Tier.Two),
(Slot.Card, Tier.Two),
null,
(Slot.CPU, Tier.One),
(Slot.Memory, Tier.Two),
(Slot.Memory, Tier.One),
(Slot.EEPROM, Tier.Any)
).map(toPair)))
).map(toPair).asJava)

// Creative
api.IMC.registerAssemblerTemplate(
"Microcontroller (Creative)",
Expand All @@ -125,25 +126,25 @@ object MicrocontrollerTemplate extends Template {
hostClass,
null,
Array(
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four
),
asJavaIterable(Iterable(
(Slot.Card, Tier.Three),
(Slot.Card, Tier.Three),
(Slot.Card, Tier.Three),
(Slot.CPU, Tier.Three),
(Slot.Memory, Tier.Three),
(Slot.Memory, Tier.Three),
Iterable(
(Slot.Card, Tier.Four),
(Slot.Card, Tier.Four),
(Slot.Card, Tier.Four),
(Slot.CPU, Tier.Four),
(Slot.Memory, Tier.Four),
(Slot.Memory, Tier.Four),
(Slot.EEPROM, Tier.Any)
).map(toPair)))
).map(toPair).asJava)

// Disassembler
api.IMC.registerDisassemblerTemplate(
Expand Down
57 changes: 29 additions & 28 deletions src/main/scala/li/cil/oc/common/template/RobotTemplate.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import net.minecraft.world.item.ItemStack

import scala.collection.JavaConverters.asJavaIterable
import scala.collection.convert.ImplicitConversionsToJava._
import scala.jdk.CollectionConverters.IterableHasAsJava

object RobotTemplate extends Template {
override protected def hostClass = classOf[internal.Robot]
Expand Down Expand Up @@ -70,7 +71,7 @@ object RobotTemplate extends Template {
Tier.One,
Tier.One
),
asJavaIterable(Iterable(
Iterable(
(Slot.Card, Tier.One),
null,
null,
Expand All @@ -79,7 +80,7 @@ object RobotTemplate extends Template {
(Slot.Memory, Tier.One),
(Slot.EEPROM, Tier.Any),
(Slot.HDD, Tier.One)
).map(toPair)))
).map(toPair).asJava)

// Tier 2
api.IMC.registerAssemblerTemplate(
Expand All @@ -101,7 +102,7 @@ object RobotTemplate extends Template {
Tier.One,
Tier.One
),
asJavaIterable(Iterable(
Iterable(
(Slot.Card, Tier.Two),
(Slot.Card, Tier.One),
null,
Expand All @@ -110,7 +111,7 @@ object RobotTemplate extends Template {
(Slot.Memory, Tier.Two),
(Slot.EEPROM, Tier.Any),
(Slot.HDD, Tier.Two)
).map(toPair)))
).map(toPair).asJava)

// Tier 3
api.IMC.registerAssemblerTemplate(
Expand All @@ -135,7 +136,7 @@ object RobotTemplate extends Template {
Tier.One,
Tier.One
),
asJavaIterable(Iterable(
Iterable(
(Slot.Card, Tier.Three),
(Slot.Card, Tier.Two),
(Slot.Card, Tier.Two),
Expand All @@ -145,7 +146,7 @@ object RobotTemplate extends Template {
(Slot.EEPROM, Tier.Any),
(Slot.HDD, Tier.Three),
(Slot.HDD, Tier.Two)
).map(toPair)))
).map(toPair).asJava)

// Creative
api.IMC.registerAssemblerTemplate(
Expand All @@ -155,32 +156,32 @@ object RobotTemplate extends Template {
"li.cil.oc.common.template.RobotTemplate.assemble",
hostClass,
Array(
Tier.Three,
Tier.Three,
Tier.Three
Tier.Four,
Tier.Four,
Tier.Four
),
Array(
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three,
Tier.Three
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four,
Tier.Four
),
asJavaIterable(Iterable(
(Slot.Card, Tier.Three),
(Slot.Card, Tier.Three),
(Slot.Card, Tier.Three),
(Slot.CPU, Tier.Three),
(Slot.Memory, Tier.Three),
(Slot.Memory, Tier.Three),
Iterable(
(Slot.Card, Tier.Four),
(Slot.Card, Tier.Four),
(Slot.Card, Tier.Four),
(Slot.CPU, Tier.Four),
(Slot.Memory, Tier.Four),
(Slot.Memory, Tier.Four),
(Slot.EEPROM, Tier.Any),
(Slot.HDD, Tier.Three),
(Slot.HDD, Tier.Three)
).map(toPair)))
(Slot.HDD, Tier.Four),
(Slot.HDD, Tier.Four)
).map(toPair).asJava)

// Disassembler
api.IMC.registerDisassemblerTemplate(
Expand Down
Loading