From 957c785c7d9914b3100d0fe375c1a73cb673ff17 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Mon, 19 Jul 2021 12:48:31 +0300 Subject: [PATCH] Umbralith (WIP) --- gradle.properties | 2 +- .../java/ru/betterend/registry/EndBlocks.java | 1 + .../assets/betterend/blockstates/umbralith.json | 11 +++++++++++ .../betterend/models/block/umbralith_1.json | 6 ++++++ .../betterend/models/block/umbralith_2.json | 6 ++++++ .../betterend/models/block/umbralith_3.json | 6 ++++++ .../betterend/models/block/umbralith_4.json | 6 ++++++ .../betterend/models/block/umbralith_5.json | 6 ++++++ .../assets/betterend/models/item/umbralith.json | 3 +++ .../betterend/textures/block/umbralith_1.png | Bin 0 -> 265 bytes .../betterend/textures/block/umbralith_2.png | Bin 0 -> 617 bytes .../betterend/textures/block/umbralith_3.png | Bin 0 -> 308 bytes .../betterend/textures/block/umbralith_3_e.png | Bin 0 -> 170 bytes .../betterend/textures/block/umbralith_4.png | Bin 0 -> 307 bytes .../betterend/textures/block/umbralith_4_e.png | Bin 0 -> 171 bytes .../betterend/textures/block/umbralith_5.png | Bin 0 -> 312 bytes .../betterend/textures/block/umbralith_5_e.png | Bin 0 -> 199 bytes src/main/resources/fabric.mod.json | 2 +- 18 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/umbralith.json create mode 100644 src/main/resources/assets/betterend/models/block/umbralith_1.json create mode 100644 src/main/resources/assets/betterend/models/block/umbralith_2.json create mode 100644 src/main/resources/assets/betterend/models/block/umbralith_3.json create mode 100644 src/main/resources/assets/betterend/models/block/umbralith_4.json create mode 100644 src/main/resources/assets/betterend/models/block/umbralith_5.json create mode 100644 src/main/resources/assets/betterend/models/item/umbralith.json create mode 100644 src/main/resources/assets/betterend/textures/block/umbralith_1.png create mode 100644 src/main/resources/assets/betterend/textures/block/umbralith_2.png create mode 100644 src/main/resources/assets/betterend/textures/block/umbralith_3.png create mode 100644 src/main/resources/assets/betterend/textures/block/umbralith_3_e.png create mode 100644 src/main/resources/assets/betterend/textures/block/umbralith_4.png create mode 100644 src/main/resources/assets/betterend/textures/block/umbralith_4_e.png create mode 100644 src/main/resources/assets/betterend/textures/block/umbralith_5.png create mode 100644 src/main/resources/assets/betterend/textures/block/umbralith_5_e.png diff --git a/gradle.properties b/gradle.properties index 80db9cf4..7ef25890 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,6 @@ archives_base_name=better-end # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api patchouli_version = 55-FABRIC-SNAPSHOT fabric_version = 0.36.1+1.17 -bclib_version = 0.2.3 +bclib_version = 0.2.4 rei_version = 6.0.264-alpha canvas_version = 1.0.+ diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index f8371344..110831de 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -180,6 +180,7 @@ public class EndBlocks extends BlocksRegistry { public static final StoneMaterial VIRID_JADESTONE = new StoneMaterial("virid_jadestone", MaterialColor.COLOR_GREEN); public static final StoneMaterial AZURE_JADESTONE = new StoneMaterial("azure_jadestone", MaterialColor.COLOR_LIGHT_BLUE); public static final StoneMaterial SANDY_JADESTONE = new StoneMaterial("sandy_jadestone", MaterialColor.COLOR_YELLOW); + public static final StoneMaterial UMBRALITH = new StoneMaterial("umbralith", MaterialColor.DEEPSLATE); public static final Block BRIMSTONE = registerBlock("brimstone", new BrimstoneBlock()); public static final Block SULPHUR_CRYSTAL = registerBlock("sulphur_crystal", new SulphurCrystalBlock()); public static final Block MISSING_TILE = registerBlock("missing_tile", new MissingTileBlock()); diff --git a/src/main/resources/assets/betterend/blockstates/umbralith.json b/src/main/resources/assets/betterend/blockstates/umbralith.json new file mode 100644 index 00000000..fe4b3e5b --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/umbralith.json @@ -0,0 +1,11 @@ +{ + "variants": { + "": [ + { "model": "betterend:block/umbralith_1", "weight": 50 }, + { "model": "betterend:block/umbralith_2", "weight": 40 }, + { "model": "betterend:block/umbralith_3", "weight": 3 }, + { "model": "betterend:block/umbralith_4", "weight": 2 }, + { "model": "betterend:block/umbralith_5", "weight": 1 } + ] + } +} diff --git a/src/main/resources/assets/betterend/models/block/umbralith_1.json b/src/main/resources/assets/betterend/models/block/umbralith_1.json new file mode 100644 index 00000000..39a08e5e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/umbralith_1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/umbralith_1" + } +} diff --git a/src/main/resources/assets/betterend/models/block/umbralith_2.json b/src/main/resources/assets/betterend/models/block/umbralith_2.json new file mode 100644 index 00000000..61f6c8a9 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/umbralith_2.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/umbralith_2" + } +} diff --git a/src/main/resources/assets/betterend/models/block/umbralith_3.json b/src/main/resources/assets/betterend/models/block/umbralith_3.json new file mode 100644 index 00000000..d6992e52 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/umbralith_3.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/umbralith_3" + } +} diff --git a/src/main/resources/assets/betterend/models/block/umbralith_4.json b/src/main/resources/assets/betterend/models/block/umbralith_4.json new file mode 100644 index 00000000..ff896e16 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/umbralith_4.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/umbralith_4" + } +} diff --git a/src/main/resources/assets/betterend/models/block/umbralith_5.json b/src/main/resources/assets/betterend/models/block/umbralith_5.json new file mode 100644 index 00000000..c9136b9b --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/umbralith_5.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "betterend:block/umbralith_5" + } +} diff --git a/src/main/resources/assets/betterend/models/item/umbralith.json b/src/main/resources/assets/betterend/models/item/umbralith.json new file mode 100644 index 00000000..b12a50bc --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/umbralith.json @@ -0,0 +1,3 @@ +{ + "parent": "betterend:block/umbralith_1" +} diff --git a/src/main/resources/assets/betterend/textures/block/umbralith_1.png b/src/main/resources/assets/betterend/textures/block/umbralith_1.png new file mode 100644 index 0000000000000000000000000000000000000000..367b5e1a9fa216addf0d01dc94c517eae4540c69 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~=>VS)S0K&K zEy%?u$|o!%B(5Z-Xdtg{p{na(VBx!D@w6L2Y0i=$zhH*{P+-n9`wCF7-P6S}L}IFH zzbDfH0}iIUU;pdBn-Dk4D@Ebi)Q5q#b8ED9m`<+#x&EHt=W-X%xwnm;?f!J)#LjHa z&2!`oclWy5++AWmhevtgw`miu$W3F~#<4`>-m+lutP7Tbd&w$ zkH-((s9gF!qcQKxs(QJ~DPx%BS}O-R5*=glTUBcKoG@$u{XApwbNK>Qwd5c5JG|qapk~=>o=@8 zN@{!K_3pai;CgAqTzB5ioA=%fVwvw{n&X_o*@m`tgrT5q9gBBgFh*mIrYi1nwjmj1 zB;yHsSD@<>5rzU?m$a>;|ESRlndYc!3xM7g2Vj{_0dUSBdSL(HL3K%A&KcU)0Wgdb zq|E%s!Ar1|8S~RO2oce?4qcaiwK$QeYD1o%pj7DxiGGSP8UQIfngFWWcozBb8Bvt5 zUM*R?y+Bo4oHK-jP+S58LCD>oAIwh9km(VPX$S@Z3K7l%Q|weBV%RZ+U%wfvPs#Twfhzq_-0Au7$?B z%f;IZFPg4PtkFER4r?36@(61*lj$k7dL#$}#4u*R-@_mvn9Ual^n0qwC?gC7s@m}J z^EZZ3!fbx--#b0Fgsyd$QId99(2A$l`5kBT1y%9D$gN?l2}eef6G) z+ci;?02~M;WyXh3U+H`L`1S$QyMkbS^W7(_zX81~09dbg zh!e?rwe&~R*YBT8#4tw63{`CrBJz`EnxpHIMl1dTAr@i>IFewL00000NkvXXu0mjf DAut{p literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/umbralith_3.png b/src/main/resources/assets/betterend/textures/block/umbralith_3.png new file mode 100644 index 0000000000000000000000000000000000000000..2b4d31828a2ab6e46d4fd66f1bde580d2946cc36 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~-2k5uS0K&K zEy%?u$|o!%B(5Z-Xdtg{p{na(VBu@b%T+BQa9)A?n=jw5Jh8vCG^RJcE(dDhFA4Gs zX84Z+p7zdL29%oR>Eak7F;#W~BOi+*2lGPRMR(r)-(OuSEWEI-%pmBD&lN2vRh9`e zn0JMh8U}?vmz=P2Yjony>wEYQY%PyXEG@2MzW-Fv|5s~!WT=vo;@79( zWenYT%2K4&J6N__GxPG~4=-iSU!7r33YE=0xKQtCc>@3P^E(69R`wr?F`TK~{k%mLwgX+s;OXk;vd$@?2>?g;a`6BF literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/umbralith_3_e.png b/src/main/resources/assets/betterend/textures/block/umbralith_3_e.png new file mode 100644 index 0000000000000000000000000000000000000000..f75b2f661856b209124608e06afbef14b28e95e1 GIT binary patch literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GB1G~p#Yx{S0G(2 zA#h%S`Eak7F;%rcQiw&7!#T34;nuzXJA~)Tw~Fjx3EZ(#(aj=$#*Dxq zmTZ@{?tSMAt_E@@#y`!?vs?9uOPPCfs51NWC!e&c&z4ne=aiiwT0DQ-&MDdoI>LYF zR!S)Eak7F;%rMQ0RyOhf}D5n{U@Gn8oBZx0_wI`7l2d4mA5Ug+age zkjWQM@#mhGCN6vK*_N|^?v^)B_q%khKfSDa*ZAC|{m8tw%SR*5Hj7<)H%8k$$WnB@&wJ{~wAnuHi!TfRnAB}vd?YsRnS#^d p?Xwiq_f0%~X;q*9{PfxqMz3ECJ;wPOe}RTGc)I$ztaD0e0ssp(M;HJA literal 0 HcmV?d00001 diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index e28609f6..74f9d109 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -45,7 +45,7 @@ "fabricloader": ">=0.11.6", "fabric": ">=0.36.0", "minecraft": ">=1.17", - "bclib": ">=0.2.3" + "bclib": ">=0.2.4" }, "suggests": { "byg": ">=1.1.3",