From 2d1e15ebbb2831fa9e91a31bbc097c910495fd8a Mon Sep 17 00:00:00 2001 From: Nicolas BARBOTIN Date: Fri, 26 Jan 2018 23:10:21 +0100 Subject: [PATCH] + Added peripherals models & textures --- README.md | 2 + .../net/montoyo/wd/client/ClientProxy.java | 4 +- .../webdisplays/blockstates/peripheral.json | 36 +++++++++--------- .../webdisplays/models/block/ccinterface.json | 8 ++++ .../webdisplays/models/block/ocinterface.json | 8 ++++ .../block/{peripheral.json => rctrl.json} | 0 .../webdisplays/recipes/ccinterface.json | 21 ++++++++++ .../webdisplays/recipes/ocinterface.json | 21 ++++++++++ .../assets/webdisplays/recipes/rctrl.json | 19 +++++++++ .../webdisplays/textures/blocks/cci_front.png | Bin 0 -> 472 bytes .../webdisplays/textures/blocks/cci_side.png | Bin 0 -> 378 bytes .../textures/blocks/cci_topbot.png | Bin 0 -> 617 bytes .../webdisplays/textures/blocks/interface.png | Bin 511 -> 0 bytes .../webdisplays/textures/blocks/oci_front.png | Bin 0 -> 765 bytes .../webdisplays/textures/blocks/oci_side.png | Bin 0 -> 676 bytes .../textures/blocks/oci_topbot.png | Bin 0 -> 645 bytes 16 files changed, 99 insertions(+), 20 deletions(-) create mode 100644 src/main/resources/assets/webdisplays/models/block/ccinterface.json create mode 100644 src/main/resources/assets/webdisplays/models/block/ocinterface.json rename src/main/resources/assets/webdisplays/models/block/{peripheral.json => rctrl.json} (100%) create mode 100644 src/main/resources/assets/webdisplays/recipes/ccinterface.json create mode 100644 src/main/resources/assets/webdisplays/recipes/ocinterface.json create mode 100644 src/main/resources/assets/webdisplays/recipes/rctrl.json create mode 100644 src/main/resources/assets/webdisplays/textures/blocks/cci_front.png create mode 100644 src/main/resources/assets/webdisplays/textures/blocks/cci_side.png create mode 100644 src/main/resources/assets/webdisplays/textures/blocks/cci_topbot.png delete mode 100644 src/main/resources/assets/webdisplays/textures/blocks/interface.png create mode 100644 src/main/resources/assets/webdisplays/textures/blocks/oci_front.png create mode 100644 src/main/resources/assets/webdisplays/textures/blocks/oci_side.png create mode 100644 src/main/resources/assets/webdisplays/textures/blocks/oci_topbot.png diff --git a/README.md b/README.md index b04f5e5..c18a91e 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,8 @@ This is the unfinished port of the WebDisplays mod for Minecraft 1.12.2. The tex * French translations * Embedded videos sound/distance * minePad management: check GuiContainer.draggedStack for minePad +* Enhance crafts +* Enhance models ### Config elements * Site blacklist diff --git a/src/main/java/net/montoyo/wd/client/ClientProxy.java b/src/main/java/net/montoyo/wd/client/ClientProxy.java index 5f85b56..3c6d319 100644 --- a/src/main/java/net/montoyo/wd/client/ClientProxy.java +++ b/src/main/java/net/montoyo/wd/client/ClientProxy.java @@ -253,8 +253,8 @@ public class ClientProxy extends SharedProxy implements IResourceManagerReloadLi registerItemModel(wd.blockScreen.getItem(), 0, "inventory"); ModelLoader.setCustomModelResourceLocation(wd.blockPeripheral.getItem(), 0, new ModelResourceLocation("webdisplays:kb_inv", "normal")); registerItemModel(wd.blockPeripheral.getItem(), 1, "facing=0,type=remotectrl"); - registerItemModel(wd.blockPeripheral.getItem(), 2, "facing=0,type=ccinterface"); //TODO: This doesn't work... - registerItemModel(wd.blockPeripheral.getItem(), 3, "facing=0,type=cointerface"); + registerItemModel(wd.blockPeripheral.getItem(), 2, "facing=2,type=ccinterface"); + registerItemModel(wd.blockPeripheral.getItem(), 3, "facing=2,type=cointerface"); registerItemModel(wd.itemScreenCfg, 0, "normal"); registerItemModel(wd.itemOwnerThief, 0, "normal"); registerItemModel(wd.itemLinker, 0, "normal"); diff --git a/src/main/resources/assets/webdisplays/blockstates/peripheral.json b/src/main/resources/assets/webdisplays/blockstates/peripheral.json index e9cdccf..5b2f9a1 100644 --- a/src/main/resources/assets/webdisplays/blockstates/peripheral.json +++ b/src/main/resources/assets/webdisplays/blockstates/peripheral.json @@ -1,23 +1,23 @@ { - "variants": { - "facing=0,type=keyboard": { "model": "webdisplays:kb_left" }, - "facing=1,type=keyboard": { "model": "webdisplays:kb_left", "y": 90.0 }, - "facing=2,type=keyboard": { "model": "webdisplays:kb_left", "y": 180.0 }, - "facing=3,type=keyboard": { "model": "webdisplays:kb_left", "y": 270.0 }, + "variants": { + "facing=0,type=keyboard": { "model": "webdisplays:kb_left" }, + "facing=1,type=keyboard": { "model": "webdisplays:kb_left", "y": 90.0 }, + "facing=2,type=keyboard": { "model": "webdisplays:kb_left", "y": 180.0 }, + "facing=3,type=keyboard": { "model": "webdisplays:kb_left", "y": 270.0 }, - "facing=0,type=remotectrl": { "model": "webdisplays:peripheral" }, - "facing=1,type=remotectrl": { "model": "webdisplays:peripheral" }, - "facing=2,type=remotectrl": { "model": "webdisplays:peripheral" }, - "facing=3,type=remotectrl": { "model": "webdisplays:peripheral" }, + "facing=0,type=remotectrl": { "model": "webdisplays:rctrl" }, + "facing=1,type=remotectrl": { "model": "webdisplays:rctrl" }, + "facing=2,type=remotectrl": { "model": "webdisplays:rctrl" }, + "facing=3,type=remotectrl": { "model": "webdisplays:rctrl" }, - "facing=0,type=ccinterface": { "model": "webdisplays:peripheral" }, - "facing=1,type=ccinterface": { "model": "webdisplays:peripheral" }, - "facing=2,type=ccinterface": { "model": "webdisplays:peripheral" }, - "facing=3,type=ccinterface": { "model": "webdisplays:peripheral" }, + "facing=0,type=ccinterface": { "model": "webdisplays:ccinterface", "y": 180.0 }, + "facing=1,type=ccinterface": { "model": "webdisplays:ccinterface", "y": 270.0 }, + "facing=2,type=ccinterface": { "model": "webdisplays:ccinterface" }, + "facing=3,type=ccinterface": { "model": "webdisplays:ccinterface", "y": 90.0 }, - "facing=0,type=cointerface": { "model": "webdisplays:peripheral" }, - "facing=1,type=cointerface": { "model": "webdisplays:peripheral" }, - "facing=2,type=cointerface": { "model": "webdisplays:peripheral" }, - "facing=3,type=cointerface": { "model": "webdisplays:peripheral" } - } + "facing=0,type=cointerface": { "model": "webdisplays:ocinterface", "y": 180.0 }, + "facing=1,type=cointerface": { "model": "webdisplays:ocinterface", "y": 270.0 }, + "facing=2,type=cointerface": { "model": "webdisplays:ocinterface" }, + "facing=3,type=cointerface": { "model": "webdisplays:ocinterface", "y": 90.0 } + } } diff --git a/src/main/resources/assets/webdisplays/models/block/ccinterface.json b/src/main/resources/assets/webdisplays/models/block/ccinterface.json new file mode 100644 index 0000000..643ca5b --- /dev/null +++ b/src/main/resources/assets/webdisplays/models/block/ccinterface.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "webdisplays:blocks/cci_topbot", + "front": "webdisplays:blocks/cci_front", + "side": "webdisplays:blocks/cci_side" + } +} diff --git a/src/main/resources/assets/webdisplays/models/block/ocinterface.json b/src/main/resources/assets/webdisplays/models/block/ocinterface.json new file mode 100644 index 0000000..0cdb319 --- /dev/null +++ b/src/main/resources/assets/webdisplays/models/block/ocinterface.json @@ -0,0 +1,8 @@ +{ + "parent": "block/orientable", + "textures": { + "top": "webdisplays:blocks/oci_topbot", + "front": "webdisplays:blocks/oci_front", + "side": "webdisplays:blocks/oci_side" + } +} diff --git a/src/main/resources/assets/webdisplays/models/block/peripheral.json b/src/main/resources/assets/webdisplays/models/block/rctrl.json similarity index 100% rename from src/main/resources/assets/webdisplays/models/block/peripheral.json rename to src/main/resources/assets/webdisplays/models/block/rctrl.json diff --git a/src/main/resources/assets/webdisplays/recipes/ccinterface.json b/src/main/resources/assets/webdisplays/recipes/ccinterface.json new file mode 100644 index 0000000..3916e35 --- /dev/null +++ b/src/main/resources/assets/webdisplays/recipes/ccinterface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "CCC", + "CSC", + "CCC" + ], + "key": { + "C": { + "item": "minecraft:dye", + "data": 6 + }, + "S": { + "item": "webdisplays:screen" + } + }, + "result": { + "item": "webdisplays:peripheral", + "data": 2 + } +} diff --git a/src/main/resources/assets/webdisplays/recipes/ocinterface.json b/src/main/resources/assets/webdisplays/recipes/ocinterface.json new file mode 100644 index 0000000..8d3d264 --- /dev/null +++ b/src/main/resources/assets/webdisplays/recipes/ocinterface.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + "GGG", + "GSG", + "GGG" + ], + "key": { + "G": { + "item": "minecraft:dye", + "data": 8 + }, + "S": { + "item": "webdisplays:screen" + } + }, + "result": { + "item": "webdisplays:peripheral", + "data": 3 + } +} diff --git a/src/main/resources/assets/webdisplays/recipes/rctrl.json b/src/main/resources/assets/webdisplays/recipes/rctrl.json new file mode 100644 index 0000000..10d9346 --- /dev/null +++ b/src/main/resources/assets/webdisplays/recipes/rctrl.json @@ -0,0 +1,19 @@ +{ + "type": "minecraft:crafting_shaped", + "pattern": [ + " E ", + "BBB" + ], + "key": { + "E": { + "item": "minecraft:ender_pearl" + }, + "B": { + "item": "minecraft:wooden_button" + } + }, + "result": { + "item": "webdisplays:peripheral", + "data": 1 + } +} diff --git a/src/main/resources/assets/webdisplays/textures/blocks/cci_front.png b/src/main/resources/assets/webdisplays/textures/blocks/cci_front.png new file mode 100644 index 0000000000000000000000000000000000000000..c61e5cc601ba3a814125e23c5a5a1122d07a36b2 GIT binary patch literal 472 zcmV;}0Vn>6P)WFU8GbZ8()Nlj2>E@cM*00BHnL_t(I%bk+FZo)7W zMi0itX=H(tEX)inl`=E*4f--wAE3|Cxo^=*Y#llyb!BED5R@Oqv7kc<4QV1O&SHPQ z*S?>x-J4FQhoUIZS`$SP{eB}*kfte~=ds)ED9e%{2*|RGJkOC*A|1!UK0J~G zxBQUs%gs>>K-FRj(DN7Mdc8(*nftF#0AAnT0hl~JV~jxrLBO>P1_R`OlRxfe$I7#_ zbs5Jo?j*dGxu94sI&~Yeo~&w4nz{>-W!cqDOp*jq2{j4NEH`xRh_QX0t)8R;xdOX4OhJ9Vw*{!{M;ALYw{SY5+nAgzLJUN%gVqb++4W_fM>n z>YJNA8IQ;G!Z17lq-lyV2G8>Vu+}1_Jk71OIF3UUMfko?9LMbUd%gjQB9d9h@PkJH O0000*5RBy_MUSWzPG(Z}F5vQQnhOLPA*^zRNwAiOPOf`OJc^ z$8gQ-Q`>SqG$%$*6TD}Cqal1>SO1N-}55&eCJ5^*>do2oqK_x zrLXYMXzAs34H~CE1vQ=4?Qa2geApZzjJF_EtAFb5BC;tWm9NrnDVKdPjN!3WFU8GbZ8()Nlj2>E@cM*00GTOL_t(I%UzO9Zrd;r zg}+C!{(~Arau#WpEs!(x4n1;#9--(Z+GY_uabQ`stnhU~S$0f;z;HA(?}yaG!-Efp z17%sV*=#6^g1W8&=(>)kX{f4-*Vk8$$0MuNiv501+qT3QiL=>^>gzW?+_loCB(d!};%c=* z(>csbJpTv^7=g|`r$7Qy0)(auCX)#<{|Q(D6G((yo`zN#2ndiN2p~WR0L1Nf%aY7C z84@O$LI0ozBWY;Pm5YlkcmF^5^%CaOb77Kg@5u|MNI}fsn zI#b~J`I-3m_{hf#^gG`_j0Loxq6@LY6>( z!2j~|l){zX_u6s7?T&P4d3kxsCcdrzVjE3nC=}T|T{_NqC!|C=v>c!QaCdi?2Q)vw z(=-iT*HKj!0Da#RV;tkY@0rbJY&IL}x@NoGl2YP7Hazi+ANzY<00000NkvXXu0mjf D4#Wmg literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/webdisplays/textures/blocks/interface.png b/src/main/resources/assets/webdisplays/textures/blocks/interface.png deleted file mode 100644 index 470f36448b58c61a22144259923fff49fe880dd7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 511 zcmVPx#32;bRa{vGf6951U69E94oEQKA0i;PpK~y-)rIW#q6EP4(Uv)dta^VI!AR)N1 z-1h&!0d5O|Kgc~1%8p&l!A`PABrJ_QYE8YVuD12`^i=%EY5?B9rG`20KXHC}gL|iJ zstgn$B%w&u8t>~FMUee80X592edPRS&lneK49bJ@D?kWEL+%{g7Y^g+-N9-1nbT#5 z`-aDcdxtRrMIk^DC>rSl2+f*A zT}9Ux&{Qds$b`|T<`upngmOp3{6;Z>H$X&EnS>MEpw*nelEMg~Y^cpAG9mI6ptW`S zjMkhpG;7oXtUtGgvJu(tfOmf8n2*Hj4v88;WkD5a9_7d-ZaWV7>kg2DgMM(#uOJaU zaJK2_>LGN?=#amW0%`$roB;U1w>g*nKiuPG_Ady=0*C+Ed>jA(002ovPDHLkV1idR B-QNHJ diff --git a/src/main/resources/assets/webdisplays/textures/blocks/oci_front.png b/src/main/resources/assets/webdisplays/textures/blocks/oci_front.png new file mode 100644 index 0000000000000000000000000000000000000000..52a173784834cc6eaa394dd216020f26d2f1be59 GIT binary patch literal 765 zcmVWFU8GbZ8()Nlj2>E@cM*00Lo2L_t(I%RQ65Zd_Fq zg}?K6uSbIm!UI4XlqT3jvgDEDjt2-m5oy8`1yQC94Tg#o@gO-=i6Xh+8A4}?nYrhj z{X=mlv)iMywbr-R4yUK5zE~{SZnuo%NUfEW5+MXc1b|@}XswZRX1QE)cXvlAh2A?k z#>mCR1@4Z!15ipv)krBJB8UhnC2}dK2r)+7o%MQ61W;8%fUEmYaW_N^5#iS_zel?8 zYW#+)`%n4pt0$N#B7%z2dncAsh$+#!5Zw?}TASvjWkf`HQr`pc-9In+{p%lbcgziU zC)Qdq5mJnd-f=T<=U%uGV#IBJEhQt;F>_*!#LZ?y42d^y zu5mR~bx+yotzqVvDk&yn3ba~Tum75D#W*)nRX9IC$M#L^y+eSM6K;-~qgn}jCTC}7 znAsfT-2Vwvqm)7jVfHJA^iGU3JhNF{&iTMYM2MWFU8GbZ8()Nlj2>E@cM*00Ia}L_t(I%RQ4zZX7WT zL?0=s+k=5O$yJ;H1`Iekc|2Jp2k_i=QksX)aZwSgb0^)6-KP4hJrm3+uYl zd#99wh+t*_EX%^SZPZ#h9*=x{e9&5Bj6qdZUSD6yOfnOI)++8nDFrjb%qXQ$Tf@yz zRWg&)=|lx^cS=zr5=hJfccb@?ilSvU^xF+pAtE4|3|ebwDQsgPnFI-DfS@YaFp5-! zgar588Du8fdne2&s(_I9*OSCN5Ea6m2#81`6Ehxg-5try9m`CrnL$G2oZM=|-3fOP*)OUn9)YSb z%&4Uh5z~b~fB(>X-~G-^L}Z`zU$ls6ZDz783jptSZ7yQ5n9_4^l> z%VoDN(uqiVzd_6fkD&L?+uIxA&KLvTwvBD;eEs@`S}V8fm2HfjQDowGLDzML>HD|u z_&v%M;QjrbWmyWFU8GbZ8()Nlj2>E@cM*00HSqL_t(I%T1C?Zsafw zL?0czQ4a&mW9?DQB`?=e`nin#5fyMO7z|dAy8{&jDf0>a-xQ2;i`-8@+eTY!WQXLe3cxA%uXLVZGxxF-EN0 zB`hkaDk8$NEVw(dlmfsKBf}jtV~l~jGkl_-^Pk7vQB`uzM0cmvN^1=Sh8f+A5CW~X zDKrM#wxO!?hJe{%-*;k+5uf8>-Eg3_Mkxg|1DIm1ky2s|$GziBN>S7gHsL@ttj-+^hSni-;s