From f0bdeb4b2e05297e3a751c09f3746302ee8bd2d3 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 1 Jan 2024 21:52:48 +0700 Subject: [PATCH] Update --- chiselsandbits/clipboard.dat | Bin 0 -> 1925 bytes config/additionalplacements-common.toml | 41 ++ config/chiselsandbits-client.toml | 114 ++++++ config/chiselsandbits-common.toml | 22 ++ config/chiselsandbits.launchproperties | 1 + config/enhancedvisuals-client.json | 368 ++++++++++++++++++ config/enhancedvisuals.json | 16 + config/playerrevive-client.json | 8 + config/playerrevive.json | 66 ++++ kubejs/client_scripts/mods/minecraft.js | 1 + kubejs/server_scripts/minecraft/recipes.js | 6 + kubejs/startup_scripts/minecraft/constants.js | 2 +- mods | 2 +- 13 files changed, 645 insertions(+), 2 deletions(-) create mode 100644 chiselsandbits/clipboard.dat create mode 100644 config/additionalplacements-common.toml create mode 100644 config/chiselsandbits-client.toml create mode 100644 config/chiselsandbits-common.toml create mode 100644 config/chiselsandbits.launchproperties create mode 100644 config/enhancedvisuals-client.json create mode 100644 config/enhancedvisuals.json create mode 100644 config/playerrevive-client.json create mode 100644 config/playerrevive.json diff --git a/chiselsandbits/clipboard.dat b/chiselsandbits/clipboard.dat new file mode 100644 index 0000000000000000000000000000000000000000..b307f615873922ffa88255cb0e4c8262d5b7dee3 GIT binary patch literal 1925 zcmV;02YUD)iwFP!00000|K;3UY}?iW2H>BRY)P~v(owE0YAUonJMl%i486D)(XLS! z4VnwGJPn9P+f1xRwp@`}nx&r9Jr&rnrf8pvqBh!M^-{DQu!p@2NZM@=0|xYEeH#+2 zTf1g$8fT3XyN=8q%B-ssxV3CZp+x#Yyvja4-}%ou@R7*@0R)DViHV_W)EE5|tmzq#J8=n4n#2-*0S zHUQJ^m7d)ClL>7b0~kE{DYw00`A!xF1LN~t>!J~WZ$e3`x~`g~V*RMobVXOO^^CM% z8B?VmX)H0W4yTo4dXJJwOOt5E+-CiZbTFNoP}6!s)uf&?(kWHb$-T#vq^3%pl9oED zj|vzVPn|j~VE1?`9mOs^eKLmas`3b!Fj^)%e~wv3KQ`QRJgsP2ESXZqq{+Xr0`~@H z*@UJihBZ?DiF9I2NuNIa2k@^V`CI@Eg_`*l8nr{rZVrtRd^ngGKbA_5DS9F`{u?AO zc~CcORvW+@mI5jqrRy9o>Vc>!9r)pXw@3yX2h0QIe+bmKx ztbH~+Et|Vbv$>pWTQnT6lc#h%wWM>)`8u~K9j|>lF-s>}n$BOv{6CnWD~J{-qB{GC zc3VVJiA3?dk-x}ru0Z;lLaMh9>4z3lYiUTo74v^&f?{5RJHj+iIr;2!y4P}QTdNb7 z+mSb1AT>ux`R$W>z>?az1}UyF&w_7;&m~wlDXc)vV$Hh&>js6z*@tz%g|%ZXSn+wo zMZKV7tmd3=m7}a0YSqdWeV}8kT#&2llvS{nt>&C=^%Z3msy(ZD_gMXpvI^JQq<#L| zNxKWMu2ERLeONsfR>xYf2Iq}yX0-e+(VC^Sgc^$0y!)b6HCPW?Se>O|y%k?DT*!5m z;%c;y>miG)Yh7G*cm%mN7kGV1d2O)I>tV~Qdre+`G?`~y6tJoRTVKHZg9}TO4Y$nW zuTWkQ`@DW&d2K1l>sc{#7C|v1LEs-n10O|~7#}R`1mow8^D?*taU;ICophBCft(Gb z3}cF%kP&!rYEg_L*SsFtO?NkA)}yFf#n8RC=Sz7eLAKIqX|nTSJd;vR z3?@^@dm)M=Fcre;(b-Q2Pm#u@clM`1cSlhN{Ot0(F!z zBNXGW^^;bZVOr~l>|M;Nq}sFt)O?iMtP9j;9H8c>)UH;E+I~wdPSoaC9lIK@hVlMQ zBV%OpaU*l%($|d$u@J~u7TSz3i>8|q5V5;r?|l`+UF1^N!eRsg7TYd`&FkGiUf2jf zi>;ZEc^`N%U1WP;eIwdxzGp38Y4X=(j8j+QJPrQnZJZx{2j^vajB6^4aomz1|FM07 z1D4?Z<<8xY#Ox?Ksw;eT&x0R8cp2Y9aD6x}0ISkuv;Ol^7nd4CM+MiZe30Z~uFBEfQ{`2tTe8 z!s7LaG84`e#W3as!OfK5KdVIWIZH6T+NU8rpOWIeL-cz8gm;L`j>o+MSQ%TRg~g!_ z?OCA>#7g8?b8}C_c|3(_Qt0eq^Lj%}#s%!$Ah92VN@i)EaCqh`>otBk=s=61;QN4y+Fv%7B3LmXoKsP%_k`3<4K~J*-OgZ zga*>P@)CHon`twStZ$806q|tyW<7tCiBqh=?O&;?hs;21p#t&N>Ve=F3W2C+Y=2G& zZ`CtO%0NgIwj)GpHYsMa*e6B@vCnMjxt45Y*TQ#|eJz~7MKyK%o~DC2i{SEVO`Ty$ z@vc<7uFo=MuWN&ZkGwJ0#m+fPliWcVg6gtYWmMEPAZYh%n=TOanA zNyxRxcX)t)w)_LMj~bw_7Z1?(bxx%x1HGhpow=51Ws~t?`3KypNk*$x*PG2`2;bKW z{le^q8brTH=0K362*way8Wn { event.remove('minecraft:plugins/campfire') event.remove('minecraft:plugins/blasting') event.remove('minecraft:plugins/smoking') + event.remove('minecraft:plugins/brewing') event.remove('minecraft:plugins/composting') // TODO: Сделать с вариантами TFC event.remove('minecraft:plugins/stripping') // TODO: Сделать с вариантами TFC event.remove('minecraft:plugins/pathing') // TODO: Сделать с вариантами TFC diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 0fd7679d6..135a9f038 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2567,6 +2567,12 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Выход: Варочная стойка + + event.remove({ id: 'minecraft:brewing_stand' }) + + //#endregion + //#region Исправление дерьма с медью (Однажды разраб GTCEu вспомнит, лучше бы забыл) event.smelting('tfc:metal/ingot/copper', 'minecraft:raw_copper') diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index cd261de3d..eff6bf267 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -595,8 +595,8 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:crafting_table', 'minecraft:chest', 'minecraft:trapped_chest', - 'minecraft:scute', 'minecraft:fishing_rod', + 'minecraft:brewing_stand', 'minecraft:warped_fungus_on_a_stick', 'minecraft:carrot_on_a_stick', 'minecraft:carrot', diff --git a/mods b/mods index 733826a76..09930c03e 160000 --- a/mods +++ b/mods @@ -1 +1 @@ -Subproject commit 733826a76f112d3bd7c5245e46cc8bda6f50127b +Subproject commit 09930c03e3d5161175eb33a6d7b6e74f1b434234