From a96bbf2b123e33dfc28bcbfe1e1129369b27eab6 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 17 Jun 2025 01:01:33 +0100 Subject: [PATCH] updated dimension marker for the beneath, new ones for other planets --- .../block/dim_markers/the_nether/down.png | Bin 0 -> 652 bytes .../block/dim_markers/the_nether/east.png | Bin 0 -> 711 bytes .../block/dim_markers/the_nether/north.png | Bin 0 -> 691 bytes .../block/dim_markers/the_nether/south.png | Bin 0 -> 699 bytes .../block/dim_markers/the_nether/up.png | Bin 0 -> 718 bytes .../block/dim_markers/the_nether/west.png | Bin 0 -> 655 bytes .../assets/tfg/blockstates/marker/mars.json | 7 +++ .../tfg/blockstates/marker/mercury.json | 7 +++ .../assets/tfg/blockstates/marker/moon.json | 7 +++ .../assets/tfg/blockstates/marker/venus.json | 7 +++ .../assets/tfg/models/block/marker/mars.json | 42 ++++++++++++++++++ .../tfg/models/block/marker/mercury.json | 42 ++++++++++++++++++ .../assets/tfg/models/block/marker/moon.json | 22 +++++++++ .../assets/tfg/models/block/marker/venus.json | 42 ++++++++++++++++++ .../assets/tfg/models/item/marker/mars.json | 3 ++ .../tfg/models/item/marker/mercury.json | 3 ++ .../assets/tfg/models/item/marker/moon.json | 3 ++ .../assets/tfg/models/item/marker/venus.json | 3 ++ kubejs/startup_scripts/main_startup_script.js | 2 +- kubejs/startup_scripts/tfg/blocks.space.js | 38 ++++++++++++++++ .../{ad_astra => tfg}/dimension_markers.js | 11 ++--- 21 files changed, 233 insertions(+), 6 deletions(-) create mode 100644 kubejs/assets/gtceu/textures/block/dim_markers/the_nether/down.png create mode 100644 kubejs/assets/gtceu/textures/block/dim_markers/the_nether/east.png create mode 100644 kubejs/assets/gtceu/textures/block/dim_markers/the_nether/north.png create mode 100644 kubejs/assets/gtceu/textures/block/dim_markers/the_nether/south.png create mode 100644 kubejs/assets/gtceu/textures/block/dim_markers/the_nether/up.png create mode 100644 kubejs/assets/gtceu/textures/block/dim_markers/the_nether/west.png create mode 100644 kubejs/assets/tfg/blockstates/marker/mars.json create mode 100644 kubejs/assets/tfg/blockstates/marker/mercury.json create mode 100644 kubejs/assets/tfg/blockstates/marker/moon.json create mode 100644 kubejs/assets/tfg/blockstates/marker/venus.json create mode 100644 kubejs/assets/tfg/models/block/marker/mars.json create mode 100644 kubejs/assets/tfg/models/block/marker/mercury.json create mode 100644 kubejs/assets/tfg/models/block/marker/moon.json create mode 100644 kubejs/assets/tfg/models/block/marker/venus.json create mode 100644 kubejs/assets/tfg/models/item/marker/mars.json create mode 100644 kubejs/assets/tfg/models/item/marker/mercury.json create mode 100644 kubejs/assets/tfg/models/item/marker/moon.json create mode 100644 kubejs/assets/tfg/models/item/marker/venus.json rename kubejs/startup_scripts/{ad_astra => tfg}/dimension_markers.js (60%) diff --git a/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/down.png b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/down.png new file mode 100644 index 0000000000000000000000000000000000000000..a8649d79193aff0f515e0ba6fd79ac70a41219e6 GIT binary patch literal 652 zcmV;70(1R|P)IvrVLweBJqs(`e^F0Idb);hRnd_4^_Heuz>Er4&+10OBBF6b*B5sXR#>BpBjF zHCgGls8l906{!M%ZubE5PlDD0%W`wi5A){~0LoUCFbr}Qy4?ff$j5248AZbkO0AU2 zlWZJ9;q+W1&yH{!ZNf0%+Y`y%cfZFOTrN(BWx2T=EX&1Q-*vDomr*n%j(iH!UN(81 z@2l?s=GLNQAbhkI#6beU{$`Qwg=4f9Xf3kEDV%=OT3}qf_L5(FrvNnT7N_T$jl+7T zB0V*|e|dI993^L@7nT9|BOTRWRosG}&5|Xe}5B9~f6R z4#w^KzBa=1+-qUmwlUJbv01mWEYdD4zfTCm3p~%w)f+%51wdgSe3}d6>l<6Cp>>b_ m%_3pw;CXHa*tVU4sgl24g*+|(^(?^v0000>Nwmc1 z!bA-V-MDaJ{13)o;Labwio}HrNnF9A#u$TP18It;g-9ntrwmRzubnn9E}D5MclGYO z_uPBVNv?7$dpnrQ2@GB1{MacSSH*7oG`12L#uxzccpL!JGy$mB>x3~RgvDNQ5^@3q z4ZH2*dp!(ejCedwqtT$zXfPOqxw@P^LtVNjQnLzLEJASk7v*vl+jjXk^!p6h zwq0!71waWUq-GV$8(pp#Ba(#{i%6jF^=MU-WHQs3rYU8dyD*}>)y8#>>wPf5L|jF5 z`@m!(g6o}f(mQ1|+2&8FhprFH!OG%`Ob~AJy`E$+m;;QYy6lz$s^4M&q|=jq542c> zWTHPni$$alVGdBUTkMtsTw7r@I*xi0Q2#5aR4i0O*XXz^hOXgzJpjrZUHP`#K3Xio zUNMSO(y1S8vpTPc-g>8O;EOhlN<352jP6LUP>zC&@z?t74b zawBj`IsmcJivV~{hpC)6<3aJ$0nzBB?DLuq#U&fnDd`Ad$xpB80I*k#N>4^oU1sl( zb7a-z0wF94pRb{Yl%)*4M{d_r$*K`;EB ziiDt`4*ky t03j@vvxgEKUS%#{;QjO(0IwT&`43!PRkw>XK}Y}q002ovPDHLkV1mNCLXZFe literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/north.png b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/north.png new file mode 100644 index 0000000000000000000000000000000000000000..4bb96017162281fffc72e268135dfa9137bcdc81 GIT binary patch literal 691 zcmV;k0!;mhP)NTLUT!|fvgY^QnxA*Cer=<68Jq3U17D;{#|&Jb0r zj#F|_)f6YS$~pV*Z|4aah7l0;$1n^?Ci#@x2_j8gkCEHi0^rPU^=5YICLz-_85tSk z&D{f<$9bOb&jgVGqUsfdF4)~}x#;eV!BsGSZgEnpoQDYTiVr-K(*f literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/south.png b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/south.png new file mode 100644 index 0000000000000000000000000000000000000000..87a612bfdf0917207f853bdce7cea7eae48a08c8 GIT binary patch literal 699 zcmV;s0!00ZP)hB zDw3y2=+Lpqla~(BHRw9Ea|)`Q0n z9>4d#pZERo^9^@*IHqL*(AD0AUMOLidE~YvGo^VN>jG4_)RLZyVB0wYff%!`tK3%y zDVRFGf!4E5P?nK{AuKb`qmsnkA4d#MP642*DgaL}>`?r+jgdX%My4NiKg02ngKxOI z!x_Jv*+frOyD&wytt>t&Wx3mH6dg$ZNheIzUjC5kdeUgkWKgVPg>rRo{In=nU+ORmI081 zA!@2B@Q1?ygnyrIqf2FQ2t=sw&ExAy_BlNh((=su03cbVE^;KdV%K^y+(> zg>P(Z%sJiQzQXA`z;=F_u7t#~;V+x0ez#9t7DAwD2B}mZ8yg${3<%MVRJ#R6B`dEh zkN|eR?g21UnrB*1lS=gg5Rb>bwKUDZDN6XHB0JB|VB0yAXaax1)B#xk^ntGaMjqEJ zqN=KwE}c`9D405yZk`~LY&*yCk;D7(0{5~LhzbFxj1)qk?q>i91Y+K&DwsO{7s&%^ zV+|-*u6d|#lbf1mphOcW(S(O?+d1Y3z98M%K96nZfHt0m7a$C~2R74sn$FG^{`SbF hEd+FwXo8U?onP9VIX6AN1Sf0jO#T%_wl> zA253JV%pfyqyup1NW5JSfbpqWs%}JGULkwAwaB`c;q~xW?o8^8^!DR=Au&7>{Li4V z)W-hy7RtSWo(Nz=#)XmI{!~JOyqUvnHt}{n#;0ac)lyo^_)-E;bt6=@#QerVs=uqp z=IX6WDFfFF(*>GQ;QH_Y*<{k)p>{rQM`%WYSMwhLxIZ{V*O?cI95<+-83pX33P4R? zN9$u>N~+-rie6%GXNjsC(a_k&cgH7F4LSBhrZ-$XQq@lsv1?^Yn~T{n6UFW`N%Q z4*o?VK?p$x;8Dc|prhCbK&M`xZq|$fLWq=l0^7Fnvfttq!Z1W3;#A3ztF0ppkICel z>Fw)E9S;IO-7bV+^LUzaxi)5C=sLcXNI%ZHYIagCU&6L+9Op3AYgrc0Z?Chyvc+*F z$Ld-T$0&UdLytdAL8}3+0U-oJh;#AHOir+mBnWhZIp`kIVg?<>MxLCcM~Pfr Ar2qf` literal 0 HcmV?d00001 diff --git a/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/west.png b/kubejs/assets/gtceu/textures/block/dim_markers/the_nether/west.png new file mode 100644 index 0000000000000000000000000000000000000000..4cacf251625bc859e0dbad9123ae225db95a87cf GIT binary patch literal 655 zcmV;A0&x9_P)+Nd*Qdhc~!?)5U>w9{gm!`$qFvp6sR zm*@W+?Q&*R0(f2tAyTw^J47Q9BGFC&T&D_v-BvJ@OU;1z{d~o0H{|aS8k2sZmcjhk>Snz6(Z42T&Ef!)g~t=Wmi`h z0Jd!dU>F7frfD|Lzbq@uYu~q(n@F@1t@J1^pV+qnXc9H6NeJL>tf-cvkqFrnofq*i zdSTzgD%Sw8tQyH=EI?veH9D%>3f$Ls7NC)XQ>D!sy!R}fPN8YP5uzQ#FpyFrgg^*^ zW^Up8M`TZQwlDNx9aOLnY<%Cx_kFanu{&~L;3EIl`uY!&$ry%VV45adOY?yiR0i(z ze)-_j@F{}-Wdg9ZG|$vThS|j(65%$qn>X%C08Kv*D7Lz2ol-tmBpE6zH#)$fQ&tLU zbheE=*2(9JDqQoYr`|cPi{5()t@)Lq@go5Shp&;(6$92iuSC5fNe^T=bjoTU^1Kqw zRj)|8dxyy9ii)fi+!5E5+qrR^>3Jas~kFI7G`2B%)}H>h*UrsARJ9Fy*WatUXh&Z5ft_t0UeZz3}?S`yt~QV pxEpZec_j+_9-kkc!Q5K~;13cjH3mAN6x09!002ovPDHLkV1jy|AL9T3 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/blockstates/marker/mars.json b/kubejs/assets/tfg/blockstates/marker/mars.json new file mode 100644 index 000000000..4e5573f11 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/marker/mars.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/marker/mars" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/marker/mercury.json b/kubejs/assets/tfg/blockstates/marker/mercury.json new file mode 100644 index 000000000..44bd64632 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/marker/mercury.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/marker/mercury" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/marker/moon.json b/kubejs/assets/tfg/blockstates/marker/moon.json new file mode 100644 index 000000000..6e386c27f --- /dev/null +++ b/kubejs/assets/tfg/blockstates/marker/moon.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/marker/moon" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/blockstates/marker/venus.json b/kubejs/assets/tfg/blockstates/marker/venus.json new file mode 100644 index 000000000..d398f1e96 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/marker/venus.json @@ -0,0 +1,7 @@ +{ + "variants": { + "": { + "model": "tfg:block/marker/venus" + } + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/marker/mars.json b/kubejs/assets/tfg/models/block/marker/mars.json new file mode 100644 index 000000000..048adf965 --- /dev/null +++ b/kubejs/assets/tfg/models/block/marker/mars.json @@ -0,0 +1,42 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "gui_light": "front", + "textures": { + "0": "ad_astra:block/globe/mars_globe", + "particle": "#0" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { + "uv": [ 3.75, 3.75, 7.5, 7.5 ], + "texture": "#0" + }, + "east": { + "uv": [ 0, 3.75, 3.75, 7.5 ], + "texture": "#0" + }, + "south": { + "uv": [ 11.25, 3.75, 15, 7.5 ], + "texture": "#0" + }, + "west": { + "uv": [ 7.5, 3.75, 11.25, 7.5 ], + "texture": "#0" + }, + "up": { + "uv": [ 7.5, 3.75, 3.75, 0 ], + "texture": "#0" + }, + "down": { + "uv": [ 3.75, 7.5, 0, 11.25 ], + "texture": "#0" + } + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/marker/mercury.json b/kubejs/assets/tfg/models/block/marker/mercury.json new file mode 100644 index 000000000..436dc0e7d --- /dev/null +++ b/kubejs/assets/tfg/models/block/marker/mercury.json @@ -0,0 +1,42 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "gui_light": "front", + "textures": { + "0": "ad_astra:block/globe/mercury_globe", + "particle": "#0" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { + "uv": [ 3.75, 3.75, 7.5, 7.5 ], + "texture": "#0" + }, + "east": { + "uv": [ 0, 3.75, 3.75, 7.5 ], + "texture": "#0" + }, + "south": { + "uv": [ 11.25, 3.75, 15, 7.5 ], + "texture": "#0" + }, + "west": { + "uv": [ 7.5, 3.75, 11.25, 7.5 ], + "texture": "#0" + }, + "up": { + "uv": [ 7.5, 3.75, 3.75, 0 ], + "texture": "#0" + }, + "down": { + "uv": [ 3.75, 7.5, 0, 11.25 ], + "texture": "#0" + } + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/marker/moon.json b/kubejs/assets/tfg/models/block/marker/moon.json new file mode 100644 index 000000000..cb52279ae --- /dev/null +++ b/kubejs/assets/tfg/models/block/marker/moon.json @@ -0,0 +1,22 @@ +{ + "credit": "Made with Blockbench", + "textures": { + "0": "moon_globe", + "particle": "moon_globe" + }, + "elements": [ + { + "from": [0, 0, 0], + "to": [16, 16, 16], + "faces": { + "north": {"uv": [3.75, 3.75, 7.5, 7.5], "texture": "#0"}, + "east": {"uv": [0, 3.75, 3.75, 7.5], "texture": "#0"}, + "south": {"uv": [11.25, 3.75, 15, 7.5], "texture": "#0"}, + "west": {"uv": [7.5, 3.75, 11.25, 7.5], "texture": "#0"}, + "up": {"uv": [7.5, 3.75, 3.75, 0], "texture": "#0"}, + "down": {"uv": [3.75, 7.5, 0, 11.25], "texture": "#0"} + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/marker/venus.json b/kubejs/assets/tfg/models/block/marker/venus.json new file mode 100644 index 000000000..c216d3856 --- /dev/null +++ b/kubejs/assets/tfg/models/block/marker/venus.json @@ -0,0 +1,42 @@ +{ + "credit": "Made with Blockbench", + "parent": "minecraft:block/cube", + "gui_light": "front", + "textures": { + "0": "ad_astra:block/globe/venus_globe", + "particle": "#0" + }, + "elements": [ + { + "from": [ 0, 0, 0 ], + "to": [ 16, 16, 16 ], + "faces": { + "north": { + "uv": [ 3.75, 3.75, 7.5, 7.5 ], + "texture": "#0" + }, + "east": { + "uv": [ 0, 3.75, 3.75, 7.5 ], + "texture": "#0" + }, + "south": { + "uv": [ 11.25, 3.75, 15, 7.5 ], + "texture": "#0" + }, + "west": { + "uv": [ 7.5, 3.75, 11.25, 7.5 ], + "texture": "#0" + }, + "up": { + "uv": [ 7.5, 3.75, 3.75, 0 ], + "texture": "#0" + }, + "down": { + "uv": [ 3.75, 7.5, 0, 11.25 ], + "texture": "#0" + } + } + } + ], + "display": {} +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/marker/mars.json b/kubejs/assets/tfg/models/item/marker/mars.json new file mode 100644 index 000000000..843d91086 --- /dev/null +++ b/kubejs/assets/tfg/models/item/marker/mars.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/marker/mars" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/marker/mercury.json b/kubejs/assets/tfg/models/item/marker/mercury.json new file mode 100644 index 000000000..39847666b --- /dev/null +++ b/kubejs/assets/tfg/models/item/marker/mercury.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/marker/mercury" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/marker/moon.json b/kubejs/assets/tfg/models/item/marker/moon.json new file mode 100644 index 000000000..6055d0605 --- /dev/null +++ b/kubejs/assets/tfg/models/item/marker/moon.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/marker/moon" +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/marker/venus.json b/kubejs/assets/tfg/models/item/marker/venus.json new file mode 100644 index 000000000..cbc4a583d --- /dev/null +++ b/kubejs/assets/tfg/models/item/marker/venus.json @@ -0,0 +1,3 @@ +{ + "parent": "tfg:block/marker/venus" +} \ No newline at end of file diff --git a/kubejs/startup_scripts/main_startup_script.js b/kubejs/startup_scripts/main_startup_script.js index 5a9d41231..38f06e40c 100644 --- a/kubejs/startup_scripts/main_startup_script.js +++ b/kubejs/startup_scripts/main_startup_script.js @@ -84,7 +84,7 @@ GTCEuStartupEvents.materialModification(event => { GTCEuStartupEvents.registry('gtceu:dimension_marker', event => { - registerAdAstraDimensionMarkers(event) + registerTFGDimensionMarkers(event) }) diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index fa4c2ec61..bc92d6eca 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -1,5 +1,43 @@ function registerTFGSpaceBlocks(event) { + // Dimension markers + + event.create('tfg:marker/moon') + .stoneSoundType() + .item(item => { + item.modelJson({ parent: 'tfg:block/marker/moon' }) + }) + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + event.create('tfg:marker/mars') + .stoneSoundType() + .item(item => { + item.modelJson({ parent: 'tfg:block/marker/mars' }) + }) + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + event.create('tfg:marker/venus') + .stoneSoundType() + .item(item => { + item.modelJson({ parent: 'tfg:block/marker/venus' }) + }) + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + + event.create('tfg:marker/mercury') + .stoneSoundType() + .item(item => { + item.modelJson({ parent: 'tfg:block/marker/mercury' }) + }) + .tagBlock('minecraft:mineable/pickaxe') + .fullBlock(true) + .opaque(true) + // Hardened stones event.create('tfg:rock/hardened_moon_stone') diff --git a/kubejs/startup_scripts/ad_astra/dimension_markers.js b/kubejs/startup_scripts/tfg/dimension_markers.js similarity index 60% rename from kubejs/startup_scripts/ad_astra/dimension_markers.js rename to kubejs/startup_scripts/tfg/dimension_markers.js index 7d8b7d73c..2afcb4c6f 100644 --- a/kubejs/startup_scripts/ad_astra/dimension_markers.js +++ b/kubejs/startup_scripts/tfg/dimension_markers.js @@ -1,29 +1,30 @@ // priority: 0 -function registerAdAstraDimensionMarkers(event) { +function registerTFGDimensionMarkers(event) { + // TODO event.create('ad_astra:earth_orbit') .iconSupplier(() => Item.of('ad_astra:earth_globe').getItem()) .tier(1) .overrideName('Earth Orbit') event.create('ad_astra:moon') - .iconSupplier(() => Item.of('ad_astra:moon_globe').getItem()) + .iconSupplier(() => Item.of('tfg:marker/moon').getItem()) .tier(1) .overrideName('The Moon') event.create('ad_astra:mars') - .iconSupplier(() => Item.of('ad_astra:mars_globe').getItem()) + .iconSupplier(() => Item.of('tfg:marker/mars').getItem()) .tier(2) .overrideName('Mars') event.create('ad_astra:venus') - .iconSupplier(() => Item.of('ad_astra:venus_globe').getItem()) + .iconSupplier(() => Item.of('tfg:marker/venus').getItem()) .tier(3) .overrideName('Venus') event.create('ad_astra:mercury') - .iconSupplier(() => Item.of('ad_astra:mercury_globe').getItem()) + .iconSupplier(() => Item.of('tfg:marker/mercury').getItem()) .tier(3) .overrideName('Mercury') } \ No newline at end of file