From d291e2bf7740ccffb859a2381cc76122738c5153 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sat, 25 Nov 2023 13:15:14 +0700 Subject: [PATCH] Fix #56 --- kubejs/data/tfc/tags/blocks/can_collapse.json | 5 -- .../tfc/tags/blocks/can_start_collapse.json | 5 -- .../tfc/tags/blocks/can_trigger_collapse.json | 5 -- .../tfc/tags/blocks/monster_spawns_on.json | 5 -- kubejs/data/tfc/tags/blocks/prospectable.json | 5 -- kubejs/server_scripts/gregtech/recipes.js | 44 ++++++++++++++++++ kubejs/server_scripts/mainServerScript.js | 4 +- kubejs/server_scripts/tfc/tags.js | 18 ++++++- kubejs/startup_scripts/constants.js | 10 ++++ ...9.jar => terrafirmagreg-1.20.1-0.0.11.jar} | Bin 165995 -> 167601 bytes 10 files changed, 73 insertions(+), 28 deletions(-) delete mode 100644 kubejs/data/tfc/tags/blocks/can_collapse.json delete mode 100644 kubejs/data/tfc/tags/blocks/can_start_collapse.json delete mode 100644 kubejs/data/tfc/tags/blocks/can_trigger_collapse.json delete mode 100644 kubejs/data/tfc/tags/blocks/monster_spawns_on.json delete mode 100644 kubejs/data/tfc/tags/blocks/prospectable.json rename mods/{terrafirmagreg-1.20.1-0.0.9.jar => terrafirmagreg-1.20.1-0.0.11.jar} (86%) diff --git a/kubejs/data/tfc/tags/blocks/can_collapse.json b/kubejs/data/tfc/tags/blocks/can_collapse.json deleted file mode 100644 index 704583787..000000000 --- a/kubejs/data/tfc/tags/blocks/can_collapse.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "#forge:tfc_stonetype_ore" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tags/blocks/can_start_collapse.json b/kubejs/data/tfc/tags/blocks/can_start_collapse.json deleted file mode 100644 index 704583787..000000000 --- a/kubejs/data/tfc/tags/blocks/can_start_collapse.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "#forge:tfc_stonetype_ore" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tags/blocks/can_trigger_collapse.json b/kubejs/data/tfc/tags/blocks/can_trigger_collapse.json deleted file mode 100644 index 704583787..000000000 --- a/kubejs/data/tfc/tags/blocks/can_trigger_collapse.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "#forge:tfc_stonetype_ore" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tags/blocks/monster_spawns_on.json b/kubejs/data/tfc/tags/blocks/monster_spawns_on.json deleted file mode 100644 index 704583787..000000000 --- a/kubejs/data/tfc/tags/blocks/monster_spawns_on.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "#forge:tfc_stonetype_ore" - ] -} \ No newline at end of file diff --git a/kubejs/data/tfc/tags/blocks/prospectable.json b/kubejs/data/tfc/tags/blocks/prospectable.json deleted file mode 100644 index 704583787..000000000 --- a/kubejs/data/tfc/tags/blocks/prospectable.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values": [ - "#forge:tfc_stonetype_ore" - ] -} \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/recipes.js b/kubejs/server_scripts/gregtech/recipes.js index a826fb125..c79cf4177 100644 --- a/kubejs/server_scripts/gregtech/recipes.js +++ b/kubejs/server_scripts/gregtech/recipes.js @@ -29,6 +29,50 @@ const registerGTRecipes = (event) => { 1399 ) + // Pump Deck + event.shaped('gtceu:pump_deck', [ + 'ABA', + 'CDE' + ], { + A: '#forge:screws/wrought_iron', + B: 'gtceu:treated_wood_planks', + C: '#forge:tools/hammers', + D: '#tfc:rock_slabs', + E: '#forge:tools/screwdrivers' + }).id('gtceu:shaped/pump_deck') + + // Pump Hatch + event.shaped('gtceu:pump_hatch', [ + 'ABC', + 'DED', + 'FBF' + ], { + A: '#forge:screws/wrought_iron', + B: '#forge:rings/wrought_iron', + C: '#forge:tools/screwdrivers', + D: 'gtceu:treated_wood_planks', + E: 'gtceu:wood_large_fluid_pipe', + F: '#tfc:rock_slabs' + + }).id('gtceu:shaped/pump_hatch') + + // Primitive Pump + event.shaped('gtceu:primitive_pump', [ + 'ABC', + 'DEF', + 'GHG' + ], { + A: '#forge:rings/wrought_iron', + B: 'gtceu:wood_normal_fluid_pipe', + C: '#forge:screws/wrought_iron', + D: '#forge:rotors/wrought_iron', + E: 'gtceu:treated_wood_planks', + F: '#forge:tools/screwdrivers', + G: '#tfc:rock_slabs', + H: 'gtceu:wood_large_fluid_pipe' + + }).id('gtceu:shaped/primitive_pump') + // Coke Oven event.shaped('gtceu:coke_oven', [ 'ABA', diff --git a/kubejs/server_scripts/mainServerScript.js b/kubejs/server_scripts/mainServerScript.js index 387d7f984..76c65aad6 100644 --- a/kubejs/server_scripts/mainServerScript.js +++ b/kubejs/server_scripts/mainServerScript.js @@ -12,7 +12,7 @@ ServerEvents.highPriorityData(event => { * Здесь регистрируются тэги для блоков. */ ServerEvents.tags('block', event => { - + registerTFCBlocksTags(event) }) /** @@ -20,7 +20,7 @@ ServerEvents.tags('block', event => { */ ServerEvents.tags('item', event => { registerCreateTags(event) - registerTFCTags(event) + registerTFCItemsTags(event) }) /** diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js index 0478a2c3a..5d7c8edb3 100644 --- a/kubejs/server_scripts/tfc/tags.js +++ b/kubejs/server_scripts/tfc/tags.js @@ -1,6 +1,6 @@ // priority: 0 -const registerTFCTags = (event) => { +const registerTFCItemsTags = (event) => { removeAllTagsItems.forEach(item => { event.removeAllTagsFrom(item) }) @@ -24,4 +24,20 @@ const registerTFCTags = (event) => { event.add('forge:ingots/double/black_steel', 'tfc:metal/double_ingot/black_steel') event.add('forge:ingots/double/blue_steel', 'tfc:metal/double_ingot/blue_steel') event.add('forge:ingots/double/red_steel', 'tfc:metal/double_ingot/red_steel') + + event.add('tfc:can_collapse', '#forge:tfc_stonetype_ore') + event.add('tfc:can_start_collapse', '#forge:tfc_stonetype_ore') + event.add('tfc:can_trigger_collapse', '#forge:tfc_stonetype_ore') + event.add('tfc:monster_spawns_on', '#forge:tfc_stonetype_ore') + event.add('tfc:prospectable', '#forge:tfc_stonetype_ore') + + global.allTFCStoneTypeNames.forEach(stoneTypeName => { + global.slabTypes.forEach(slabType => { + event.add(`tfc:rock_slabs`, `tfc:rock/${slabType}/${stoneTypeName}_slab`) + }) + }) +} + +const registerTFCBlocksTags = (event) => { + } \ No newline at end of file diff --git a/kubejs/startup_scripts/constants.js b/kubejs/startup_scripts/constants.js index 9211d6291..2cf0e3dc3 100644 --- a/kubejs/startup_scripts/constants.js +++ b/kubejs/startup_scripts/constants.js @@ -47,4 +47,14 @@ global.allTFCStoneTypeNamesOnlyDups = [ 'diorite', 'andesite', 'granite' +]; + +global.slabTypes = [ + 'raw', + 'smooth', + 'bricks', + 'cobble', + 'mossy_bricks', + 'mossy_cobble', + 'cracked_bricks' ]; \ No newline at end of file diff --git a/mods/terrafirmagreg-1.20.1-0.0.9.jar b/mods/terrafirmagreg-1.20.1-0.0.11.jar similarity index 86% rename from mods/terrafirmagreg-1.20.1-0.0.9.jar rename to mods/terrafirmagreg-1.20.1-0.0.11.jar index 66ae1ec12c2515a384941086ec0cea1223064aa4..28c4510a7611b6dfab29587765c488949bb864b8 100644 GIT binary patch delta 11301 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 P_>YSR+~c`{(Z>2etdFi3 delta 9744 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