From be23b09e9c7c216070b034209d355b64463ce432 Mon Sep 17 00:00:00 2001 From: Redeix <59435925+Redeix@users.noreply.github.com> Date: Tue, 8 Jul 2025 06:18:54 -0500 Subject: [PATCH] Machine casings for Tom and moon rabbit meat stuff I forgot to push (#1259) * - Lots of ui updates. And a couple fixes. * - New button textures. - Fixed campfire loot table. - Made anvil rod recipes easier. - Added assembler recipes for multiblock tank parts. * - Added assembler recipes for multiblock tank parts. * - Updated Changelog * - Some more UI tweaks. - Added modern-markings mod with integration. * - Updated stromatolite textures - Added some more WIP venus foliage * - Moved some blocks over from tfg-core. * - Updated textures for tier-1 rocket and food oven. * - Updated textures for more ad-astra stuff + new panorama * - Biodiesel stuff * - Quests re-ordering and some new ones * - Hide wild crops from emi * - Hide wild crops from emi * - Moon rabbit meat * - Moon rabbit meat * - Moon rabbit meat textures and casings for tom * - models * - oops * - rocket * - ooops --------- Co-authored-by: Pyritie --- kubejs/assets/tfg/lang/en_us.json | 5 ++++- .../casings/machine_casing_blue_solar_panel.json | 1 + ...achine_casing_clean_stainless_steel_desh.json | 1 + .../block/casings/machine_casing_desh_ptfe.json | 1 + .../machine_casing_green_solar_panel.json | 1 + .../block/casings/machine_casing_iron_desh.json | 1 + .../block/casings/machine_casing_ptfe_desh.json | 1 + .../casings/machine_casing_red_solar_panel.json | 1 + .../machine_casing_stainless_steel_desh.json | 1 + .../tfg/models/item/spawn_egg/moon_rabbit.json | 6 ++++++ .../casings/machine_casing_blue_solar_panel.png | Bin 0 -> 454 bytes .../machine_casing_blue_solar_panel.png.mcmeta | 5 +++++ .../machine_casing_blue_solar_panel_ctm.png | Bin 0 -> 833 bytes ...machine_casing_clean_stainless_steel_desh.png | Bin 0 -> 429 bytes ..._casing_clean_stainless_steel_desh.png.mcmeta | 5 +++++ ...ine_casing_clean_stainless_steel_desh_ctm.png | Bin 0 -> 762 bytes .../block/casings/machine_casing_desh_ptfe.png | Bin 0 -> 579 bytes .../casings/machine_casing_desh_ptfe.png.mcmeta | 5 +++++ .../casings/machine_casing_desh_ptfe_ctm.png | Bin 0 -> 957 bytes .../casings/machine_casing_green_solar_panel.png | Bin 0 -> 439 bytes .../machine_casing_green_solar_panel.png.mcmeta | 5 +++++ .../machine_casing_green_solar_panel_ctm.png | Bin 0 -> 782 bytes .../block/casings/machine_casing_iron_desh.png | Bin 0 -> 673 bytes .../casings/machine_casing_iron_desh.png.mcmeta | 5 +++++ .../casings/machine_casing_iron_desh_ctm.png | Bin 0 -> 1454 bytes .../block/casings/machine_casing_ptfe_desh.png | Bin 0 -> 610 bytes .../casings/machine_casing_ptfe_desh.png.mcmeta | 5 +++++ .../casings/machine_casing_ptfe_desh_ctm.png | Bin 0 -> 1239 bytes .../casings/machine_casing_red_solar_panel.png | Bin 0 -> 419 bytes .../machine_casing_red_solar_panel.png.mcmeta | 5 +++++ .../machine_casing_red_solar_panel_ctm.png | Bin 0 -> 775 bytes .../machine_casing_stainless_steel_desh.png | Bin 0 -> 395 bytes ...achine_casing_stainless_steel_desh.png.mcmeta | 5 +++++ .../machine_casing_stainless_steel_desh_ctm.png | Bin 0 -> 761 bytes .../textures/item/food/cooked_moon_rabbit.png | Bin 0 -> 571 bytes .../tfg/textures/item/food/raw_moon_rabbit.png | Bin 0 -> 600 bytes .../tfg/textures/item/spawn_egg/moon_rabbit.png | Bin 0 -> 466 bytes kubejs/startup_scripts/tfg/blocks.js | 14 ++++++++++++++ kubejs/startup_scripts/tfg/constants.js | 11 +++++++++++ 39 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 kubejs/assets/tfg/models/block/casings/machine_casing_blue_solar_panel.json create mode 100644 kubejs/assets/tfg/models/block/casings/machine_casing_clean_stainless_steel_desh.json create mode 100644 kubejs/assets/tfg/models/block/casings/machine_casing_desh_ptfe.json create mode 100644 kubejs/assets/tfg/models/block/casings/machine_casing_green_solar_panel.json create mode 100644 kubejs/assets/tfg/models/block/casings/machine_casing_iron_desh.json create mode 100644 kubejs/assets/tfg/models/block/casings/machine_casing_ptfe_desh.json create mode 100644 kubejs/assets/tfg/models/block/casings/machine_casing_red_solar_panel.json create mode 100644 kubejs/assets/tfg/models/block/casings/machine_casing_stainless_steel_desh.json create mode 100644 kubejs/assets/tfg/models/item/spawn_egg/moon_rabbit.json create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel_ctm.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh.png create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh.png.mcmeta create mode 100644 kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh_ctm.png create mode 100644 kubejs/assets/tfg/textures/item/food/cooked_moon_rabbit.png create mode 100644 kubejs/assets/tfg/textures/item/food/raw_moon_rabbit.png create mode 100644 kubejs/assets/tfg/textures/item/spawn_egg/moon_rabbit.png diff --git a/kubejs/assets/tfg/lang/en_us.json b/kubejs/assets/tfg/lang/en_us.json index deed341fb..e9cc62e9e 100644 --- a/kubejs/assets/tfg/lang/en_us.json +++ b/kubejs/assets/tfg/lang/en_us.json @@ -366,6 +366,9 @@ "item.tfg.food.cooked_crawlermari": "Cooked Crawlermari", "item.tfg.food.raw_limpet": "Raw Limpet", "item.tfg.food.cooked_limpet": "Cooked Limpet", + "item.tfg.food.raw_moon_rabbit": "Raw Moon Rabbit", + "item.tfg.food.cooked_moon_rabbit": "Cooked Moon Rabbit", + "item.tfg.spawn_egg.moon_rabbit": "Moon Rabbit Spawn Egg", "item.tfg.food.freeze_dried.red_grapes": "Freeze Dried Red Grapes", "item.tfg.food.freeze_dried.white_grapes": "Freeze Dried White Grapes", "item.tfg.food.freeze_dried.glow_berries": "Freeze Dried Glow Berries", @@ -1693,7 +1696,7 @@ "quests.space_survival.food.task": "Any space food", "quests.space_survival.satellite.title": "Space Stations", "quests.space_survival.satellite.subtitle": "For when you really want to get away from it all", - "quests.space_survival.satellite.desc": "By putting the above items into a Rocket's inventory, you'll be able to build a &9Space Station&r in orbit once you launch! There's not really much to do up there, and they're totally optional, but if you want a void dimension with no gravity for whatever reason, or just &oreally&r like sky diving, they're an option.", + "quests.space_survival.satellite.desc": "By keeping the above items in your inventory, you'll be able to build a &9Space Station&r in orbit once you launch! There's not really much to do up there, and they're totally optional, but if you want a void dimension with no gravity for whatever reason, or just &oreally&r like sky diving, they're an option.", "quests.space_survival.flag.title": "Flag Planter", "quests.space_survival.flag.subtitle": "LunaFirmaCraft", "quests.space_survival.flag.desc": "Introduce yourself to the Moon by planting a flag with whatever image you like on it!", diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_blue_solar_panel.json b/kubejs/assets/tfg/models/block/casings/machine_casing_blue_solar_panel.json new file mode 100644 index 000000000..18c99e7c4 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_blue_solar_panel.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_bottom_top","textures":{"bottom":"gtceu:block/casings/steam/steel/bottom","side":"gtceu:block/casings/steam/steel/side","top":"tfg:block/casings/machine_casing_blue_solar_panel"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_clean_stainless_steel_desh.json b/kubejs/assets/tfg/models/block/casings/machine_casing_clean_stainless_steel_desh.json new file mode 100644 index 000000000..3e6b24fd9 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_clean_stainless_steel_desh.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_clean_stainless_steel_desh"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_desh_ptfe.json b/kubejs/assets/tfg/models/block/casings/machine_casing_desh_ptfe.json new file mode 100644 index 000000000..2fbf76514 --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_desh_ptfe.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_desh_ptfe"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_green_solar_panel.json b/kubejs/assets/tfg/models/block/casings/machine_casing_green_solar_panel.json new file mode 100644 index 000000000..4cdbd4bbc --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_green_solar_panel.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_bottom_top","textures":{"bottom":"gtceu:block/casings/steam/steel/bottom","side":"gtceu:block/casings/steam/steel/side","top":"tfg:block/casings/machine_casing_green_solar_panel"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_iron_desh.json b/kubejs/assets/tfg/models/block/casings/machine_casing_iron_desh.json new file mode 100644 index 000000000..6c707c62b --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_iron_desh.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_iron_desh"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_ptfe_desh.json b/kubejs/assets/tfg/models/block/casings/machine_casing_ptfe_desh.json new file mode 100644 index 000000000..3fe3d33bf --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_ptfe_desh.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_ptfe_desh"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_red_solar_panel.json b/kubejs/assets/tfg/models/block/casings/machine_casing_red_solar_panel.json new file mode 100644 index 000000000..cfbebc2ef --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_red_solar_panel.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_bottom_top","textures":{"bottom":"gtceu:block/casings/steam/steel/bottom","side":"gtceu:block/casings/steam/steel/side","top":"tfg:block/casings/machine_casing_red_solar_panel"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/block/casings/machine_casing_stainless_steel_desh.json b/kubejs/assets/tfg/models/block/casings/machine_casing_stainless_steel_desh.json new file mode 100644 index 000000000..3c3ae106f --- /dev/null +++ b/kubejs/assets/tfg/models/block/casings/machine_casing_stainless_steel_desh.json @@ -0,0 +1 @@ +{"parent":"minecraft:block/cube_all","textures":{"all":"tfg:block/casings/machine_casing_stainless_steel_desh"}} \ No newline at end of file diff --git a/kubejs/assets/tfg/models/item/spawn_egg/moon_rabbit.json b/kubejs/assets/tfg/models/item/spawn_egg/moon_rabbit.json new file mode 100644 index 000000000..185724546 --- /dev/null +++ b/kubejs/assets/tfg/models/item/spawn_egg/moon_rabbit.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "tfg:item/spawn_egg/moon_rabbit" + } +} \ No newline at end of file diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png new file mode 100644 index 0000000000000000000000000000000000000000..22ca0f381c04ce208b695d94f1ad45d5f7d933f6 GIT binary patch literal 454 zcmV;%0XhDOP)9aPM2JX`1alEBG9sc?f54yC zFNl^wL|em!5Pr~z(MAxvEz}%8S{Mx2;yPEyQS5Bab3f-j@0lCOUR+P~sK#P+zk9wp zfOfm9*f4a0dQ>A6+C+TuJl!U;1E z7Uj9TOfmqy4~2n5GBdfl%<|aIE#JH%Zj3wLYVR`zuEeHQUCsG>$ep(Fbv%@UiIYv06q}H!MdFQng9R*07*qoM6N<$f*4WB{{R30 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png.mcmeta new file mode 100644 index 000000000..c69cb893f --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_blue_solar_panel_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_blue_solar_panel_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..6e367f22f1cfd0f8ae62004fb26a158b86bdd00c GIT binary patch literal 833 zcmV-H1HSx;P)LwTsTIJuJXuZJu+J~liSMnJjKYgZVX>Es;nvp5e>&SAnNT<{c;kgAi*TQnK z_BMxUzVXay0OL=fKP^Buy;n51|09|A+bplRCt^jfpxgq5Azs1lTRvXy-ZjPNy@FCV z+}Z9#jjLqSdvv(mGUZYy*Rge81t7k)O=Kl%j_=ntQX_VxPmj>0QU*YBy=bUfUU5&v za^+HN6yjTVWhS|CeUP__5mWrIeVWxsOv}LLT3DvYP%q4AdSQm_#=E=)&GMiXF`MD( zWvbj#m%8Q2RJv+j>A1gK_7zl8$+|L=^j&eW_-D)%Kk5mwy|b&mf^s)pq}fP=R*E<0 z!{&I8whHO%~JdQKB+751ELowTlf6pAP!z|1O>4D=UJ40R5t`M(4=`H=@fqC2N06>9 zBKQUl`Vw|<@&Uv}w>q>_1(CSeLJA=z79+I|`S2#C3hIBkhjV}De-E5{GN;w;iJ^}H zXjyqo!{!hx+~B&mJ&sy{t$rIz6UpM%v&dq$+4b6&%M&pRJIDTdfyJ^q)vl@+0JymHFhU-}UC`BFooz2m6wi{(*j|=T X{qC4h9^`^300000NkvXXu0mjfk950d literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh.png.mcmeta new file mode 100644 index 000000000..87c726471 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_clean_stainless_steel_desh_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_clean_stainless_steel_desh_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..641cdb72328600e2ba24a12190e9ed0fce9f30d4 GIT binary patch literal 762 zcmVsErl*}g>ngA;J9#&=|3GVxxP#9a(7Lo`dyOW zd%y2{zxU(!zVCO}c6Q9)wrvC8I1c4S7b?$9~+6RfjDI1 zisWzO-_n63RU3sU9f(69fUqJ-QX|b;J#sFJA9)MjML@s}&wRpW>)>$i~tx%Fk^paEC3kgRx}?QYz2u#av*%R5+#nWiNWezM9dCIp4oj zI7K<0S%Z)k%93n(UUY3sN~uw;LJU|9Z@^#h>+4AT!>lz%Dxz%cxQIsoT|BoxcDo-&%9b5h*Tx2u)2 zFC##)yDFv^bLc&eSS7@|JhxdwK|sBNtChj!`n1#b&M?=Wn#MIKQcXx zPU-<$euU()(Mg@nRg-b4C5y|LUd;I|+$Z;b~LjV8(07*qoM6N<$f*Utn;Q#;t literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_desh_ptfe.png new file mode 100644 index 0000000000000000000000000000000000000000..9ef259302f51d9bca00df48f5288468dd5ec6f4a GIT binary patch literal 579 zcmV-J0=)f+P)Os$z`s0M0o?1Zyp6nlcy+u+|bJ zNkWn&R8>V3MclUrDtP=*`TBE>{q1W$oCsh5_%ehvO}Vzb#>_q>EIZa>=P&W(hlC*J`4N0ObL z9o^d6LRHE0+>fYpxiieU7SLMD=4LA|&vSy&XvAbPp{{EH#^W)n+M9J(C?bAe>bmCq z{JfRW?ShCBSAX=h{;OxrKlolBR|@xJbr67$lixcUB`DO%GyLyOF)J zS-sQFy!U3_yqWpltR#PbW2QcyMw|*(%u%0S*k%3pf81R4Dbhde8hqa;j$;~)1{)8) zEcCzn^FOKm?(QxQz=Pkm_)u=H`sw#LeOB(Tz8UK;BI$PpV0qzv&fqLjpT- zIK9n+>$(_Yxb^MpLVuYV1}q|jEx350k{kRi?d)o%r>9S4ZvzGfTVPMBm0s9o>+!p^ zJx-slPK34fPYeAo-P*_nBR?)&HX|ctB7e2lKS|BS3l;uK`qb-nj*gCKHk*9WF7|(U zUI>DKFbvt=-p2X;&V1oLAE&n`UuzA(-AA7l`d|6!buOTZaKHv3BB$a&Rwlv$dk~W( zIh8*QGgg`d0G{Wai33TJq*&w+HARx#TzB7|W`uh&a$j^n`d zx5FC~h9O#OwAMI{MgtK^SL%6QnsQsQ>_iqc*%yscifXkAK&R7T<<3`y9QfnLvviDh zyNztDESr<=`SZ8uSYCL4A_pd+p9lxav?s!WGWyaSD65yU{{?0B6L}Am(U*P?lx!!5JQcr80s|zp+qOZ;1`y>uLkq)(54Py+QP6sClg4{$Rg7=Y! zVf1oX62hP;X|37Y+hcKY5v3G6J3G*}_k5V<>}{x4s{}!SQi^uFjT1%D$V9d;i{h+k zt#KSDZCkbjtgRQn2d@44Z(2LF)`Km`mfCD4va5ysHUZ4e&T?>YfbaWgt=Zq-Pq*O1 fm0Nitot*vuj|>+n@jdgN00000NkvXXu0mjfF^tB2 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_green_solar_panel.png new file mode 100644 index 0000000000000000000000000000000000000000..0aa35dcf814af8acba7ee46daf8a901941d80a02 GIT binary patch literal 439 zcmV;o0Z9IdP)f z?V%d*(AuI13Hd0d#VUb%NH%SnmO7Vxc9NNWcV?$_b9=Wi4Z*s3eo*iMxUQG6lqQ;K z2r895L{$gi^rW5(c>nm!?Z2Wa0C61C?e) zyMF{o5~zUHbr-*-3Cc>gIwA7Ij7RpMz>y#F{PfDv;X#sMy;#0eEMDY?08D3b;oHBi z5cwfSO<<({MoZ#7bdxSXQt8Of7t5##d?#Q!i)pkZ4-x3c|`JSw%ChDd4w=QFDz#=- zvLMBoKdE(c1yR)tQhg`D@#Z+*9H79;O6OK*(Yd;c0pN*f0Tn8el3l2|!_cN13;*8e?K5@~VdEu$a6wF*2{MmkV8Ck4lJ@ zI&VLc%VtPDxUa+?y?o7=uiwxetLn2&*28Q|WhN;VEda(7IsmgXISj*8;I^)q+5X?F^4i+&*1#zUdO?4PQ*iI@ZGPRkrNsMAL6B8;wNA6u;qsNVXS>j? zvksZ53jmZ)Dmcc35})WLGA1&T?GbvIWdN3*A zdoS=NSk4a=qp-r1{A>WA&pm%gVSC4WX!Kvp(|@m6O&WKkl?xuC_XEyy-gO{uKd`vE zLL5GJKMxc?}F8x3pUT?qqM7Ebrd;bRsr%3|n0t=$xn0O6@(5Ft* zEvY~Pux>0V^#coL5lqnc_78m}R)kz?fzXn@bp0xtVn2Whd;5p{0o4OUVNIBSod5s; M07*qoM6N<$f*w_Bo&W#< literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_iron_desh.png new file mode 100644 index 0000000000000000000000000000000000000000..71b03a85accbda53a71d0212f1236fe43190ad31 GIT binary patch literal 673 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 literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh.png.mcmeta new file mode 100644 index 000000000..bb510aff7 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_ptfe_desh_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_ptfe_desh_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..b4eafc6f3857f923d0cf65231407c60a1f0d4e2c GIT binary patch literal 1239 zcmV;|1StE7P)X~HLGa>7BLXfazAreIj;sp?j@(#X` z~-Mdyq==FM>wL}DKEdbN$6cOS2*57>o*?D%ikGTKPP~H4!=^YzSpSknj z|8$P{;NXBXO)1L~Yi-Msm6a9ut$<}&GMP*k0+eOxzWuxOegKKY?VBvi+{^wCxJZ4; zY~FyIlY7Furqe0bTB@qz|UILO>B|f$NLPvZN>q2W+h+%Q7MZtJl_AQ3#y} zsH%#|WWwB9?94V!tG61SF3%NQfklKY%iK9Tw+yZ%%&lD-IT68#IERf0#s^>Ic~KND zw0cgz{S;iz&UJ$O&d;rN4g;rC;2SHrrUpQ31|Uh2R_LRX+sd*$1@1yFO##lWB@QX5 z;M3`}Wvn^Z)$8?~BjcUiMMJAybMCJ!%Xs%fbEivzF7-SF2T0S@eJ4rc!1dMnsB(^m zR230t@23pB6ll)FYFE#@!tR(8HO^F3<)YZ-e7NEeT&vXw?_!7+?`)2v)!xzD&anG7 zy6T8U7@z09v7hr$8~ks8{)dCk*M;ELTK<{56U{+%K53dP7xJZZ98I ztR^XGn!3BfngLi#W49NZh}gd*Ns?9_C>66Tb6{Gen!3oq;qzDZYeZV~RRvAcl&Y$* z*0N5!8^$+Z&D@X36fK@A$7g#*^BwT`WpT`tN40Z#HDP`I2Fup)*C9_H^@t4Ymq)~3 z+&K>{u4Gj?i3B^d?%a4MMC2f~$i*k%2$=$H?a9 zrd?F+U5!OwrBoA<7SES~tF6zr*bh~g$dqN-;(Vx(j@un$*rFNIr@B$)S_ZD70*iY? zm;H1)Jtgl7t_o>F&;8yIf`=ltXaLohhid6}RgHYSYzzyH)$_B)xUNY^6*7$6sd+#P zE^NuVR#sM6ls1*;WjR-SZEQw8_QAVe4oz1K!TlNVta-pso3)nszfet${rvgh8UdZ8 z{MOwyN&C*n{afZ!HxG@VOM&qQ~dlJ8<+ab=Jomb z-j^4!GwZZoBH`i(tI$?ppy_&0_w=K^f(JkL`Q~1&?cY7Pl zfBLvb{Nj(pQ$V_>e;&e>k1DcvBKKRh9g?LpB(!_SXl#h@KQu0+8r~+%$8I0|G}Yi& zFAKwb%KMEmoE)>^sWod4lj!M~;*q+7Vy01N;C002ovPDHLkV1nfk BbyENU literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png new file mode 100644 index 0000000000000000000000000000000000000000..7d45fbbb0b080aecf6c5594bf063a421f40ac69a GIT binary patch literal 419 zcmV;U0bKrxP)$QwM?>FeXnyd0M}h<7Q&)p zwM=TYDrVCF;HKL-+Ay0hj^;tQ1t3Wh?7@%q#Ozjno`lUP|Tdcr|$SU$<0Cw9XxAw0TB0r|lzM#>T zanY+2gj=^y-CHmD1dO zFb+jj!L+?oJpYtws?lnhvWV-Ach;)n>@DeAP!`ix8&_4mNpU)^Q!txG&T8O91k0FU zDc?Yrl}dN_{eA!GQ8$xn7C;xONb8NqZWmJ#!onU5a~}v{9nDX*{2x}^&T0bGVW0p2 N002ovPDHLkV1gq}xZMB% literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png.mcmeta new file mode 100644 index 000000000..c5464f67c --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_red_solar_panel_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_red_solar_panel_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..203abe54f5e5bf9c5c78b96d2997e1eeeac6eeb6 GIT binary patch literal 775 zcmV+i1Ni)jP)=X1sdh8>#Qc)z708$YViqk+HC&Gk)+=Cfsoy5kDkvgZ}v;KG2|IW^gwUhl_ zk1_KeJeoG?bGw7U=U6TW!y%>hSA1T&OU3{4tibQHbLIf9?E$U2jpzB;YS@hXt%i-& zu*ntXaV!_dasgO*u?&!!572IR{0)dB4#(N@k})%12QbT{36f&BI|wZx^JkP1WjqZZ{3NEUsWnb2!PBDr>aRUBUx#R^B*+}g4Y2B0O?YYfIuIG*B6A!D zKNYusw9@e_$_7+SDSO=HOIIrfS@^p210t1*ql%PV z+vf{9S^1g!fvkM(cyF>Rj+$WF!fO4Wh5sb|KoNAAv^CZw6qn6PAex+j#j(rYu?kbo&dxtO|39;>=lk1DCTp5D)zMxI;C*)D{5&m* zGg;H^Y*4BVz zT5Fbz6?wX)V3j@wJfF{NXV+BqKr`{T@HU5RMS>QAuG zIkXG486FGvH`J~2o7Oe3_Rb>WC?-ilQ4|dP0>-Sk`*;Fixv1z|vfH+%4Y0IZ#CcjW po^-tHYAShJ)JhDqgJFG&CZ002ovPDHLkV1h(jrxpMJ literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh.png.mcmeta b/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh.png.mcmeta new file mode 100644 index 000000000..765ff61b8 --- /dev/null +++ b/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh.png.mcmeta @@ -0,0 +1,5 @@ +{ + "ldlib": { + "connection": "tfg:block/casings/machine_casing_stainless_steel_desh_ctm" + } +} diff --git a/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh_ctm.png b/kubejs/assets/tfg/textures/block/casings/machine_casing_stainless_steel_desh_ctm.png new file mode 100644 index 0000000000000000000000000000000000000000..3bb4708c10e52922f1a5b690261680381f79d19d GIT binary patch literal 761 zcmVZNbcr>MlWm3RV_djSzC99*Gt2$s8o_JDvMoLSb!Nj5ff8hhvS%>K=cTPG*K z@0m)LWdL-$U2F-%(CC+!m*(AgJmzR`m-YTFe?NRhDdof`NkZq_M}8)4d~vL`20$rg z0+El2Q#-)%c#PJXwcrkb(P+eAFmU2UPA^vQ0JPTZ?7TBGu;KFR0K{>xWY;#qyYQ3A z#OR(3?C<|@f~#z+WFBveCrTX0l?GL?*vd>gy;XuBaOMG?J#Rk*Fl*^%9ZJBQne)_p zH0HvKc;&$=xI7DSUL`JknxLNO3rx45+wHQs`O4XO9QR83zD-#c1#bcf!;mb?3h8wbyeJjBIKRHix6PNT7DW+S z>q4QBck&^bwf%m*cT;fe!cQg>I^Z^QG`+orPRWH zAc`V$4gKv6ux=xr-YNjEr_Yk*AYZmOFY=|64~W$12evn$b#O4eAB{%&>`N8RKCSlB zmTiRJ+S)3N%__-fXJKc%Qx-^n(~eN zfu{VE^aD-!C+i35^1huU>XhWB{FC(qb$M?QthIK&=XLnT{XkRRPm%<9oNCiFHF^*P zX1uCu3UB}1%yXV3iQ)bJ_fG)yrv_4|U-G!%*wUHWnE>8@c5*KAcK9U^V0c_Cv5@O_ rsRarpJC~OEE6OYCa{WLb7#_oa*T+@?3Gg0I00000NkvXXu0mjfA8~GB literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/cooked_moon_rabbit.png b/kubejs/assets/tfg/textures/item/food/cooked_moon_rabbit.png new file mode 100644 index 0000000000000000000000000000000000000000..c2d29f0715a3f8fb2e942c3f3289c7b6941898eb GIT binary patch literal 571 zcmV-B0>u4^P)TlR;<`K@^6+savU{73xWPkkZ}~Dk=>GMJ7i*6nYUw z1OovN;#CvSn<#qnBt7UUC}M?r)YA-zErg;dltM3yXbiD*vDv0I-Q7G7+ierAUg{6S zKX2ar|GdY{C=p>d=mE%#l!&6>pCg|xnkWh+pDvn>)+$jHkQph(1_=tsZW}-n?nue$ z!#%7vzVqOu7vl<2 zePW`p#kr>!_4?WhYfX>$`TI8Eg=>>`dCBGTjTiRS_&vLC{~_+azN7~n%vKBQYb(@i z3%t4T$kuBM03@8uk3KlB0hX6sp1*tsfD#e%>7p4eDD9WUj!&M@i?=@7>e;r=RvbH< z3AJAq3vlqV(z#Q|G4DR$m&MLBRcw$MDUs?EGg?r(e_Gkbgy{ZhW#_y$NA|+tfgVzW zdjOctgc@M+iC8yK+qX~)71@eo8xx}ave-GVjTAC;1{`#HY;Z#M%MrU002ov JPDHLkV1l`T0FwX! literal 0 HcmV?d00001 diff --git a/kubejs/assets/tfg/textures/item/food/raw_moon_rabbit.png b/kubejs/assets/tfg/textures/item/food/raw_moon_rabbit.png new file mode 100644 index 0000000000000000000000000000000000000000..30d09064f04fd621b1618464c524106df1c7d149 GIT binary patch literal 600 zcmV-e0;m0nP)TlfO?>Q545N{UOnYM)M}BWvFy;r~?iT64Tp~n3yp7 z8WY`gaPSYHi7ajmYGUF-7^!gp`~yt5m#7R)z=V>Z3va0HE0Q*?w1xh7y$XOlPR_j^tu<$X7a$c)<2apvu5oipI!;HAn^Usgs^d5vQqlB*fQvi#pG!cy z_86rDw?fo^{$O$DiMac4S~}g(=DDPOjn|}*{M{CWvIVC5?x*}5ys#!BCUaU9Ojooje z9*e8Njb)K31{J`A%ex{mHj4cGg-kK1!YhpffmAe2dDJf_#=2rj538gnFP8MMs;!l1 zhRzcTUE=2Ts{jmcEDM15tLKzqIlre6w0qQJah3GsMWz^3wY3t4_5 zVL1$xdWpU?;`F;MCy+6x7l1zdFl zB!F+BK=v@swyT8ye2K?Jd<%s>-@U1}R>HQc08}DA+CyI1SHbb5)6NW#hSi`F@%3>h m1pWqB*lo*&=fC{Mv)~uY?>7z0hRTHi0000Lk}=BaP!NT`s3Al_0udBNL@ct9ly1Se0ykil;0_c! zaT|6v7J_@QOBGNQB1lZkyyhjC7yst{)7?Aw%sF%JQAC8_ROMG_01@FQ6|U>bY&QGa z%y6}DP0#ZLz;PU|*DI!JiiogSER=uWmR9gQPe!8=mSu6j-x&-BjK^aP!(cw2m(-L7 zhzQkc6~iz{k_27X>2x{_heN_JEU7K5;JU6%CKJLiAR=_TT^z>&ko9`4 zd>sIwX&S9o3r*9AqKGJpI2;c6zK?C&KPzxuSEkb`s;Y86pD|67dcDr$@u1i1;rl+B zv48+d!GknSIUbLsX-d1@#xM+?&nE!=e!svTMN!#A5yAI;;y9++Y!b(D&iYxq-HzAm zm7kR?M2e#1Ce~^-PN!2o#I|kr`#k_b5U^Y>b6m;9AP7)ZH3xsP-EOy1Y6}VgvgrOb zD_?K3+0bY-Sglq{cK21m#~+KX>r^TgE|&}2?Y0!-f`b38Kgcl2xL|uW{Qv*}07*qo IM6N<$f~=s(<^TWy literal 0 HcmV?d00001 diff --git a/kubejs/startup_scripts/tfg/blocks.js b/kubejs/startup_scripts/tfg/blocks.js index 6784d385e..17b9cf992 100644 --- a/kubejs/startup_scripts/tfg/blocks.js +++ b/kubejs/startup_scripts/tfg/blocks.js @@ -15,6 +15,20 @@ const registerTFGBlocks = (event) => { item.modelJson({ parent: 'minecraft:block/end_portal_frame' }) }) + // #region Machine Casings + + global.TFG_MACHINE_CASINGS.forEach(type => { + event.create(`tfg:block/casings/${type}`) + .model(`tfg:block/casings/${type}`) + .soundType('copper') + .hardness(5) + .resistance(6) + .tagBlock('minecraft:mineable/pickaxe') + .mapColor('color_light_gray') + }) + + //#endregion + // #region Decorative vases global.MINECRAFT_DYE_NAMES.forEach(color => { event.create(`tfg:decorative_vase/generated/${color}`, 'cardinal') diff --git a/kubejs/startup_scripts/tfg/constants.js b/kubejs/startup_scripts/tfg/constants.js index 05e2bf04d..a10f91b82 100644 --- a/kubejs/startup_scripts/tfg/constants.js +++ b/kubejs/startup_scripts/tfg/constants.js @@ -68,6 +68,17 @@ global.MARS_BIOMES = [ 'tfg:mars/martian_mountains' ] +global.TFG_MACHINE_CASINGS = [ + 'machine_casing_clean_stainless_steel_desh', + 'machine_casing_desh_ptfe', + 'machine_casing_iron_desh', + 'machine_casing_ptfe_desh', + 'machine_casing_stainless_steel_desh', + 'machine_casing_blue_solar_panel', + 'machine_casing_green_solar_panel', + 'machine_casing_red_solar_panel' +]; + global.UNIVERSAL_CIRCUIT_TIERS = ["ulv", "lv", "mv", "hv", "ev", "iv", "luv", "zpm", "uv", "uhv"]; global.FOOD_FRUIT = [