From 5bec53e7cd02f82185e073ce5f4fb9251e03d836 Mon Sep 17 00:00:00 2001 From: Pyritie Date: Tue, 26 Aug 2025 00:00:43 +0100 Subject: [PATCH] spice stuff! --- kubejs/assets/tfg/blockstates/spice.json | 21 +++++ .../assets/tfg/models/block/sand_spice.json | 6 ++ .../assets/tfg/textures/block/sand_spice.png | Bin 1763 -> 680 bytes kubejs/data/tfg/loot_tables/blocks/spice.json | 20 +++++ .../biome/mars/martian_deep_desert.json | 4 +- .../mars/terrain/spice_disc.json | 74 ++++++++++++++++++ .../mars/terrain/spice_disc.json | 19 +++++ kubejs/server_scripts/ad_astra/tags.js | 3 + kubejs/startup_scripts/gtceu/machines.js | 8 +- kubejs/startup_scripts/tfg/blocks.space.js | 14 ++-- 10 files changed, 157 insertions(+), 12 deletions(-) create mode 100644 kubejs/assets/tfg/blockstates/spice.json create mode 100644 kubejs/assets/tfg/models/block/sand_spice.json create mode 100644 kubejs/data/tfg/loot_tables/blocks/spice.json create mode 100644 kubejs/data/tfg/worldgen/configured_feature/mars/terrain/spice_disc.json create mode 100644 kubejs/data/tfg/worldgen/placed_feature/mars/terrain/spice_disc.json diff --git a/kubejs/assets/tfg/blockstates/spice.json b/kubejs/assets/tfg/blockstates/spice.json new file mode 100644 index 000000000..c78fc36c7 --- /dev/null +++ b/kubejs/assets/tfg/blockstates/spice.json @@ -0,0 +1,21 @@ +{ + "variants": { + "": [ + { + "model": "species:block/red_suspicious_sand_0" + }, + { + "model": "species:block/red_suspicious_sand_1" + }, + { + "model": "species:block/red_suspicious_sand_2" + }, + { + "model": "species:block/red_suspicious_sand_3" + }, + { + "model": "tfg:block/sand_spice" + } + ] + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/sand_spice.json b/kubejs/assets/tfg/models/block/sand_spice.json new file mode 100644 index 000000000..6adc983e4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/sand_spice.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/cube_all", + "textures": { + "all": "tfg:block/sand_spice" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/sand_spice.png b/kubejs/assets/tfg/textures/block/sand_spice.png index 2989871e6a5aa867adafd937fcc557a0d2aa97d2..34865a8525bad997aaa73230308c93cd8823f21e 100644 GIT binary patch delta 656 zcmaFNyMlFsN|I{9q2u%pDW`n$d|=4bM< zx5?kUbwNv0D~ZE)i`JK*506%Ud#3onx9h=K`=#ZI<(#%(5*Em@Y}8uH;+3s?>C&y- zwbEzbO)Am#v}utIKDhJD8SD4gKcD&hEj0elyNWty2F;Q~^($Njwid2YNxbrF{n@YQ z3)iUJx|iv(C+7d3Ly=r_|4x>2ypopWA>^j(#{T=J{mMixUPYEpi`Cy(pHn@&BxpY4 zgB=%Diqk$MB=9nv&lhmX?W?;InR(7AKd0foLwB^4yl3z_(Fxnm{@q=EBK7!$ZN5wG znniXs1r&Ww31WL1#n@2qBCu6+XJye%!>)5&qURsXeO`DcL-a;7UlmuS&^RPq1D4+zAo z7k=^m=AU(g`R|l$R-<&bOWRKR_bElYugT9%_Vg^+`Fn3|{=B%?M})V3d1^InijH57 z*1{=wY#8b!k~~j3Kh}M$oOx))Ro@REE7x7N-e$=Dzi*SKiR%4(+wJS7*$Ga_ea*|j Qz`)7i>FVdQ&MBb@0RIFryZ`_I literal 1763 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7SkfJR9T^xl_H+M9WMyDr zP)PO&@?~JCQe$9fXklRZ#lXPO@PdJ%)PRBERRRNp)eHs(@q#(K0&N%=7$&4fc&7RK zGH5X{FmN!iF|si*GcYhPGB7bPFbYB0j0_BnQVbxI85tND!WgCD>^MdZs2U~)hW1Pb z7O-9hhBO8U@PP6mH1h&RsA@(Ah6PM;)dCBc5p0mge*T4585kHi3p^r=85p>QL70(Y z)*J~224=U+kcg59UmvUF{9L`nl>DSry^7odkS+$B3ag6Tg51=SM1_jnoV;SI3R@+x z3ah+gE0D0hk^)#sNw%$0gl~X?bAC~(f|;Iyo`I4bmx6+VO;JjkRgjAtRC`fMnypes zNlAf~zJ7Umxn8-kUVc%!zM-Y1rM`iYzLAk`QA(O_ab;dfVufyAu`tKo%*$0K}aonP~`{@`|C}O3u&K2g&Fg>KW)`)0SG1i9;Jm z2BHn@FNke6Aj7Pj^K%P|Qj3c-^YiQsZNL_wh#{N@Q6H3AoS#z)@R>yq!5r53(S-hDdB0kOk2-1Z3ow*}0abZ%>*8Z{1RmLi0J8x3YhI2_$Y&wZfJNF;8IX~<5ZSLZCiMI}OUrRlB=E=Js zeWkGzmuR+~o?cf|TkZHodDU}k!OI0JuWF(C!d4L)*zUka;js0z&AQ2mc{_ERaDeSL4{C90MMzMl|$%jTQL zHfu2s6_Z=FvEnm2qiXaIvTeJ?FlF-8rDa;%sxN&lVK2xr>QzYybQHg|XI0|mMIl>G z|CWChe??=q=#1w7)7&&4O*~uNvahvp$rAszbaAU}JYX%nGoti!i$j#*a)`$2ZS vnKt*-c^iXYSl{*fxH7LoyR}VC`qWQ$w%eJ$4}Z)m1C`gFu6{1-oD!M { event.add('ad_astra:mars_stone_replaceables', 'tfc:rock/hardened/shale') event.add('ad_astra:mars_stone_replaceables', 'ad_astra:mars_stone') event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_mars_stone') + event.add('ad_astra:mars_stone_replaceables', 'minecraft:red_sandstone') event.add('ad_astra:mars_stone_replaceables', 'ad_astra:venus_stone') + event.add('ad_astra:mars_stone_replaceables', 'ad_astra:venus_sandstone') + event.add('ad_astra:mars_stone_replaceables', 'create:ochrum') event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_venus_stone') event.add('ad_astra:mars_stone_replaceables', 'gtceu:red_granite') event.add('ad_astra:mars_stone_replaceables', 'tfg:rock/hardened_red_granite') diff --git a/kubejs/startup_scripts/gtceu/machines.js b/kubejs/startup_scripts/gtceu/machines.js index d10fd0205..f4fec0da5 100644 --- a/kubejs/startup_scripts/gtceu/machines.js +++ b/kubejs/startup_scripts/gtceu/machines.js @@ -576,11 +576,11 @@ const registerGTCEuMachines = (event) => { .appearanceBlock(() => Block.getBlock('gtceu:nonconducting_casing')) .pattern(definition => FactoryBlockPattern.start() .aisle(' ' ,'A A', 'AAAAA', 'ACCCA', 'AAEAA', ' AAA ') - .aisle(' ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') - .aisle(' G ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' G ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') .aisle(' GGG ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') - .aisle(' G ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') - .aisle(' ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') + .aisle('GGGGG' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' GGG ' ,' ', 'ADDDA', 'D D', 'A A', ' BFB ') + .aisle(' G ' ,' ', 'BBBBB', 'B B', 'BB BB', ' BFB ') .aisle(' ' ,'A A', 'AAAAA', 'ACXCA', 'AACAA', ' AAA ') .where('X', Predicates.controller(Predicates.blocks(definition.get()))) .where('A', Predicates.blocks('gtceu:secure_maceration_casing')) diff --git a/kubejs/startup_scripts/tfg/blocks.space.js b/kubejs/startup_scripts/tfg/blocks.space.js index 129cf3b55..782177196 100644 --- a/kubejs/startup_scripts/tfg/blocks.space.js +++ b/kubejs/startup_scripts/tfg/blocks.space.js @@ -336,16 +336,16 @@ function registerTFGSpaceBlocks(event) { event.create('tfg:spice', 'tfg:particle_emitter') .textureAll('tfg:block/sand_spice') .soundType('sand') - .hardness(1) - .resistance(1) - .unbreakable() - .lightLevel(0.1) + .hardness(2) + .resistance(6) .mapColor('color_white') - .particleOffset(0, 2, 0) - .particleVelocity(0.05, 0, 0.05) + .particleOffset(0.3, 1.5, 0.3) + .particleVelocity(0, 0.05, 0) .particle('electric_spark') - .particleCount(3) + .particleCount(2) .particleForced(false) + .fullBlock(true) + .opaque(true) event.create('tfg:grass/amber_clay_mycelium') .property(BlockProperties.SNOWY)