From 6f55282537e7f9f3d2e9a26b9d8323e38f48e384 Mon Sep 17 00:00:00 2001
From: Shadowfacts <me@shadowfacts.net>
Date: Mon, 8 Mar 2021 18:32:20 -0500
Subject: [PATCH] Add Screen and Serial Cable and Console recipe

---
 .../net/shadowfacts/phycon/init/PhyItems.kt   |   4 ++
 .../resources/assets/phycon/lang/en_us.json   |   2 +
 .../assets/phycon/models/item/screen.json     |   6 +++
 .../phycon/models/item/serial_cable.json      |   6 +++
 .../assets/phycon/textures/item/screen.png    | Bin 0 -> 688 bytes
 .../phycon/textures/item/serial_cable.png     | Bin 0 -> 828 bytes
 .../phycon/advancements/recipes/console.json  |  32 ++++++++++++++++
 .../phycon/advancements/recipes/screen.json   |  32 ++++++++++++++++
 .../advancements/recipes/serial_cable.json    |  35 ++++++++++++++++++
 .../data/phycon/recipes/console.json          |  16 ++++++++
 .../resources/data/phycon/recipes/screen.json |  16 ++++++++
 .../data/phycon/recipes/serial_cable.json     |  16 ++++++++
 12 files changed, 165 insertions(+)
 create mode 100644 src/main/resources/assets/phycon/models/item/screen.json
 create mode 100644 src/main/resources/assets/phycon/models/item/serial_cable.json
 create mode 100644 src/main/resources/assets/phycon/textures/item/screen.png
 create mode 100644 src/main/resources/assets/phycon/textures/item/serial_cable.png
 create mode 100644 src/main/resources/data/phycon/advancements/recipes/console.json
 create mode 100644 src/main/resources/data/phycon/advancements/recipes/screen.json
 create mode 100644 src/main/resources/data/phycon/advancements/recipes/serial_cable.json
 create mode 100644 src/main/resources/data/phycon/recipes/console.json
 create mode 100644 src/main/resources/data/phycon/recipes/screen.json
 create mode 100644 src/main/resources/data/phycon/recipes/serial_cable.json

diff --git a/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt b/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt
index 704d196..76913fe 100644
--- a/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt
+++ b/src/main/kotlin/net/shadowfacts/phycon/init/PhyItems.kt
@@ -37,6 +37,8 @@ object PhyItems {
 	val SCREWDRIVER = ScrewdriverItem()
 	val CONSOLE = ConsoleItem()
 	val TWISTED_PAIR = Item(Item.Settings())
+	val SCREEN = Item(Item.Settings())
+	val SERIAL_CABLE = Item(Item.Settings())
 
 	fun init() {
 		register(InterfaceBlock.ID, INTERFACE)
@@ -52,6 +54,8 @@ object PhyItems {
 		register(ScrewdriverItem.ID, SCREWDRIVER)
 		register(ConsoleItem.ID, CONSOLE)
 		register(Identifier(PhysicalConnectivity.MODID, "twisted_pair"), TWISTED_PAIR)
+		register(Identifier(PhysicalConnectivity.MODID, "screen"), SCREEN)
+		register(Identifier(PhysicalConnectivity.MODID, "serial_cable"), SERIAL_CABLE)
 	}
 
 	private fun register(id: Identifier, item: Item) {
diff --git a/src/main/resources/assets/phycon/lang/en_us.json b/src/main/resources/assets/phycon/lang/en_us.json
index b475786..1292d0e 100644
--- a/src/main/resources/assets/phycon/lang/en_us.json
+++ b/src/main/resources/assets/phycon/lang/en_us.json
@@ -12,6 +12,8 @@
   "item.phycon.screwdriver": "Screwdriver",
   "item.phycon.console": "Console",
   "item.phycon.twisted_pair": "Twisted Pair",
+  "item.phycon.screen": "Screen",
+  "item.phycon.serial_cable": "Serial Cable",
 
   "gui.phycon.terminal_buffer": "Buffer",
   "gui.phycon.console.details": "Device Details",
diff --git a/src/main/resources/assets/phycon/models/item/screen.json b/src/main/resources/assets/phycon/models/item/screen.json
new file mode 100644
index 0000000..a657bf0
--- /dev/null
+++ b/src/main/resources/assets/phycon/models/item/screen.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "phycon:item/screen"
+  }
+}
diff --git a/src/main/resources/assets/phycon/models/item/serial_cable.json b/src/main/resources/assets/phycon/models/item/serial_cable.json
new file mode 100644
index 0000000..160ca26
--- /dev/null
+++ b/src/main/resources/assets/phycon/models/item/serial_cable.json
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "phycon:item/serial_cable"
+  }
+}
diff --git a/src/main/resources/assets/phycon/textures/item/screen.png b/src/main/resources/assets/phycon/textures/item/screen.png
new file mode 100644
index 0000000000000000000000000000000000000000..46e93d2b4e66036b4b7c25603692a86a91ac2126
GIT binary patch
literal 688
zcmV;h0#E&kP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>8_!4t5X`%ut;yh>ALD6^c+H)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfb8}L3krMxx6k5c3aNLh~_a1le0HIc5n$<A|Xu54C
z<1sOvSrr4X@FR#G3}ISkmN6$u3A7zw_we!cF3PjopZjxkt67TyK9P8q8KzCVK|Hl-
z8=Uuv!>k~y#OK7LCS8#Dk?V@bZ=CZk3p_Jyrjql-VPY}g!b%IXf~gTt5=T@`r+gvp
zvC4UivsS9G#y$B9Ls@-gnd>wM5yv8yAVGwJ3W_MfMwC{a6bnh(kG1g+xPFOT3b~44
z<XAu%8f4cG{s+IiwQ>{VUQ#FqbiO#w$1o7s1?pAD`95}>`U&8F2Cnp`zgz=mK1r`O
zwa5|ByA51iH#KDsxZDBypA6ZQUCB>V$mM|dGy0|s(02=Tt$DpQ_Hp_Eq^PUJ4RCM>
zjN~bMz0JFWt-bwwrqSOIftPZvK8KEG00006VoOIv0I>kh0NuB@kN5xp010qNS#tmY
zE+YT{E+YYWr9XB6000McNliru<pT&1B{bbA^^5=j0If+xK~y-)V_={VFv1uX%?tjM
zqVYs+0wdf2%a(=z|NsBbQ0Z+;l;-xWhZ#P+e#3BMQVAmyOpsX3=xX5xy!h~$Xain;
z{DNx0|NsAqHUwES0|NsC3%UYQT!P{Sask|cM}Phit?A+4|JYqXj3LOH(ZYZcYRG>g
zlOCC2!1y1B0WV*_BHEBwuU=sqaOK`}q6~TY`W3^Glb11lq><M{Qf9g_sf3Y%8UO$b
WB}ZKO%?2z00000<MNUMnLSTX((kglY

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/phycon/textures/item/serial_cable.png b/src/main/resources/assets/phycon/textures/item/serial_cable.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c97fef5d865d1dd891bcfa53bb82c0cccce1285
GIT binary patch
literal 828
zcmV-C1H=4@P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0004mX+uL$Nkc;*
zaB^>EX>4Tx04R}tkv&MmKpe$iQ>8_!4t5X`%ut;yh>ALD6^c+H)C#RSm|Xe=O&XFE
z7e~Rh;NZt%)xpJCR|i)?5c~jfb8}L3krMxx6k5c3aNLh~_a1le0HIc5n$<A|Xu54C
z<1sOvSrr4X@FR#G3}ISkmN6$u3A7zw_we!cF3PjopZjxkt67TyK9P8q8KzCVK|Hl-
z8=Uuv!>k~y#OK7LCS8#Dk?V@bZ=CZk3p_Jyrjql-VPY}g!b%IXf~gTt5=T@`r+gvp
zvC4UivsS9G#y$B9Ls@-gnd>wM5yv8yAVGwJ3W_MfMwC{a6bnh(kG1g+xPFOT3b~44
z<XAu%8f4cG{s+IiwQ>{VUQ#FqbiO#w$1o7s1?pAD`95}>`U&8F2Cnp`zgz=mK1r`O
zwa5|ByA51iH#KDsxZDBypA6ZQUCB>V$mM|dGy0|s(02=Tt$DpQ_Hp_Eq^PUJ4RCM>
zjN~bMz0JFWt-bwwrqSOIftPZvK8KEG00006VoOIv03-k;03^;uI931v010qNS#tmY
z3ljhU3ljkVnw%H_000McNliru<pT&39}T1ccas1B0Xa!TK~y-)wUe<*13?f#-=0x}
zpgF=Jv5BHvq)-uUtRq|}et;H&jiq9fPY}|HA7JB8T)<LfD~Xm-Y{ZZ%iYQUzSjb(x
z%ieWPH_JZe&Fn1vXOycAX4cP!&b8J82!N9X3nKmZwj|+Js}<!=hJYxg$a`yPu*y=G
zg{?a&Z#2ZB9Wzokcyw|efL`|&fc)bTX_b}l`xJ{s0l4h!k%arbE+9Nz?OF>uA#9AH
zlB@IidY^!Qxzg$h0MpCI;_7`V%<c?^Xp8~iVDo{>NIe0Ad^|@mz}Unb<AudRKfdqB
zo<?iU&C7NS{{DK4wccsg1_nV8D6KW8hq=gPY3kexcbc^b9vX_x<hosr!9zp*o7hZN
zN*Aec>NX`!JkP@zW4&u#<<KOAvm*5`1VNxe*md31z5fCKj*(ONobl)Y0000<MNUMn
GLSTZz^KTdc

literal 0
HcmV?d00001

diff --git a/src/main/resources/data/phycon/advancements/recipes/console.json b/src/main/resources/data/phycon/advancements/recipes/console.json
new file mode 100644
index 0000000..d8395d1
--- /dev/null
+++ b/src/main/resources/data/phycon/advancements/recipes/console.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "phycon:console"
+    ]
+  },
+  "criteria": {
+    "has_serial_cable": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "phycon:serial_cable"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "phycon:console"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_serial_cable",
+      "has_the_recipe"
+    ]
+  ]
+}
diff --git a/src/main/resources/data/phycon/advancements/recipes/screen.json b/src/main/resources/data/phycon/advancements/recipes/screen.json
new file mode 100644
index 0000000..92203c7
--- /dev/null
+++ b/src/main/resources/data/phycon/advancements/recipes/screen.json
@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "phycon:screen"
+    ]
+  },
+  "criteria": {
+    "has_glowstone": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:glowstone_dust"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "phycon:screen"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_glowstone",
+      "has_the_recipe"
+    ]
+  ]
+}
diff --git a/src/main/resources/data/phycon/advancements/recipes/serial_cable.json b/src/main/resources/data/phycon/advancements/recipes/serial_cable.json
new file mode 100644
index 0000000..297c276
--- /dev/null
+++ b/src/main/resources/data/phycon/advancements/recipes/serial_cable.json
@@ -0,0 +1,35 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "phycon:serial_cable"
+    ]
+  },
+  "criteria": {
+    "has_redstone_and_gold": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "item": "minecraft:redstone"
+          },
+          {
+            "tag": "c:gold_ingots"
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "phycon:serial_cable"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_redstone_and_gold",
+      "has_the_recipe"
+    ]
+  ]
+}
diff --git a/src/main/resources/data/phycon/recipes/console.json b/src/main/resources/data/phycon/recipes/console.json
new file mode 100644
index 0000000..0053262
--- /dev/null
+++ b/src/main/resources/data/phycon/recipes/console.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " I ",
+    "ISI",
+    " C "
+  ],
+  "key": {
+    "I": {"tag": "c:iron_ingots"},
+    "S": {"item": "phycon:screen"},
+    "C": {"item": "phycon:serial_cable"}
+  },
+  "result": {
+    "item": "phycon:console"
+  }
+}
diff --git a/src/main/resources/data/phycon/recipes/screen.json b/src/main/resources/data/phycon/recipes/screen.json
new file mode 100644
index 0000000..22acf52
--- /dev/null
+++ b/src/main/resources/data/phycon/recipes/screen.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "GGG",
+    "ggg",
+    "RRR"
+  ],
+  "key": {
+    "G": {"item": "minecraft:glass_pane"},
+    "g": {"item": "minecraft:glowstone_dust"},
+    "R": {"item": "minecraft:redstone"}
+  },
+  "result": {
+    "item": "phycon:screen"
+  }
+}
diff --git a/src/main/resources/data/phycon/recipes/serial_cable.json b/src/main/resources/data/phycon/recipes/serial_cable.json
new file mode 100644
index 0000000..1c28ccb
--- /dev/null
+++ b/src/main/resources/data/phycon/recipes/serial_cable.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    " C ",
+    "CRC",
+    "GC "
+  ],
+  "key": {
+    "C": {"item": "minecraft:blue_carpet"},
+    "R": {"item": "minecraft:redstone"},
+    "G": {"tag": "c:gold_ingots"}
+  },
+  "result": {
+    "item": "phycon:serial_cable"
+  }
+}