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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