From ce819193e124661ec5b3587f1f28a4870366d936 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Mon, 29 Jan 2024 17:20:04 +0700 Subject: [PATCH] fixiki --- config/do_a_barrel_roll-client.json | 62 ++++++++++ config/do_a_barrel_roll-server.json | 1 + kubejs/server_scripts/gregtech/tags.js | 4 + kubejs/server_scripts/minecraft/recipes.js | 18 +++ kubejs/server_scripts/minecraft/tags.js | 4 + kubejs/startup_scripts/gtceu/constants.js | 6 + kubejs/startup_scripts/minecraft/constants.js | 106 +++++++++++++++++- 7 files changed, 199 insertions(+), 2 deletions(-) create mode 100644 config/do_a_barrel_roll-client.json create mode 100644 config/do_a_barrel_roll-server.json diff --git a/config/do_a_barrel_roll-client.json b/config/do_a_barrel_roll-client.json new file mode 100644 index 000000000..07978de1f --- /dev/null +++ b/config/do_a_barrel_roll-client.json @@ -0,0 +1,62 @@ +{ + "format_version_do_not_edit": 2, + "general": { + "mod_enabled": true, + "controls": { + "switch_roll_and_yaw": false, + "invert_pitch": false, + "momentum_based_mouse": false, + "momentum_mouse_deadzone": 0.2, + "show_momentum_widget": true, + "activation_behaviour": "VANILLA", + "disable_when_submerged": true + }, + "hud": { + "show_horizon": false + }, + "banking": { + "enable_banking": true, + "banking_strength": 20.0, + "simulate_control_surface_efficacy": false + }, + "thrust": { + "enable_thrust": false, + "max_thrust": 2.0, + "thrust_acceleration": 0.1, + "thrust_particles": true + }, + "misc": { + "enable_easter_eggs": true + } + }, + "sensitivity": { + "smoothing": { + "smoothing_enabled": true, + "smoothing_pitch": 1.0, + "smoothing_yaw": 0.4, + "smoothing_roll": 1.0 + }, + "camera_smoothing": { + "pitch": 1.0, + "yaw": 2.5, + "roll": 1.0 + }, + "desktop": { + "pitch": 1.0, + "yaw": 0.4, + "roll": 1.0 + }, + "controller": { + "pitch": 1.0, + "yaw": 0.4, + "roll": 1.0 + } + }, + "advanced": { + "banking_x_formula": "sin($roll * TO_RAD) * cos($pitch * TO_RAD) * 10 * $banking_strength", + "banking_y_formula": "(-1 + cos($roll * TO_RAD)) * cos($pitch * TO_RAD) * 10 * $banking_strength", + "elevator_efficacy_formula": "$velocity_x * $look_x + $velocity_y * $look_y + $velocity_z * $look_z", + "aileron_efficacy_formula": "$velocity_x * $look_x + $velocity_y * $look_y + $velocity_z * $look_z", + "rudder_efficacy_formula": "$velocity_x * $look_x + $velocity_y * $look_y + $velocity_z * $look_z" + } +} \ No newline at end of file diff --git a/config/do_a_barrel_roll-server.json b/config/do_a_barrel_roll-server.json new file mode 100644 index 000000000..9e26dfeeb --- /dev/null +++ b/config/do_a_barrel_roll-server.json @@ -0,0 +1 @@ +{} \ No newline at end of file diff --git a/kubejs/server_scripts/gregtech/tags.js b/kubejs/server_scripts/gregtech/tags.js index 5df2de65c..232b68b32 100644 --- a/kubejs/server_scripts/gregtech/tags.js +++ b/kubejs/server_scripts/gregtech/tags.js @@ -8,6 +8,10 @@ const registerGTCEUItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', item) }) + global.GTCEU_HIDED_ITEMS.forEach(item => { + event.add('c:hidden_from_recipe_viewers', item) + }) + // Добавление тега EMI для скрытия всех руд event.add('c:hidden_from_recipe_viewers', '#forge:ores') diff --git a/kubejs/server_scripts/minecraft/recipes.js b/kubejs/server_scripts/minecraft/recipes.js index 1d6940de1..217d03cd2 100644 --- a/kubejs/server_scripts/minecraft/recipes.js +++ b/kubejs/server_scripts/minecraft/recipes.js @@ -2587,6 +2587,24 @@ const registerMinecraftRecipes = (event) => { //#endregion + //#region Выход: Якорь возрождения + + event.remove({ id: 'minecraft:respawn_anchor' }) + + //#endregion + + //#region Выход: Элитра + + // Ну и херь я придумал + event.recipes.gtceu.assembler('detector_rail') + .itemInputs('6x #forge:plates/polyvinyl_butyral', '2x #forge:rings/titanium', '2x #forge:rods/titanium', '4x #forge:single_cables/aluminium') + .circuit(32) + .itemOutputs(Item.of('minecraft:elytra', "{Damage:0,display:{Name:'{\"text\":\"Божественные крылья\",\"italic\":true}'}}")) + .duration(1600) + .EUt(666) + + //#endregion + //#region Исправление дерьма с медью (Однажды разраб GTCEu вспомнит, лучше бы забыл) //event.smelting('tfc:metal/ingot/copper', 'minecraft:raw_copper') diff --git a/kubejs/server_scripts/minecraft/tags.js b/kubejs/server_scripts/minecraft/tags.js index 41074ff42..dffc0ebd2 100644 --- a/kubejs/server_scripts/minecraft/tags.js +++ b/kubejs/server_scripts/minecraft/tags.js @@ -6,6 +6,10 @@ const registerMinecraftItemTags = (event) => { event.add('c:hidden_from_recipe_viewers', item) }) + global.MINECRAFT_HIDED_ITEMS.forEach(item => { + event.add('c:hidden_from_recipe_viewers', item) + }) + // Теперь обсидиан сторадж блок event.add('forge:storage_blocks/obsidian', 'minecraft:obsidian') } diff --git a/kubejs/startup_scripts/gtceu/constants.js b/kubejs/startup_scripts/gtceu/constants.js index 14cdaaa8e..4a07960f4 100644 --- a/kubejs/startup_scripts/gtceu/constants.js +++ b/kubejs/startup_scripts/gtceu/constants.js @@ -42,4 +42,10 @@ global.GTCEU_DISABLED_ITEMS = [ 'gtceu:rubber_log', 'gtceu:rubber_leaves', 'gtceu:rubber_planks', +]; + +global.GTCEU_HIDED_ITEMS = [ + 'gtceu:netherrack_dust', + 'gtceu:small_netherrack_dust', + 'gtceu:tiny_netherrack_dust' ]; \ No newline at end of file diff --git a/kubejs/startup_scripts/minecraft/constants.js b/kubejs/startup_scripts/minecraft/constants.js index c494ecd26..9b7cbfed8 100644 --- a/kubejs/startup_scripts/minecraft/constants.js +++ b/kubejs/startup_scripts/minecraft/constants.js @@ -579,7 +579,6 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:chain_command_block', 'minecraft:turtle_egg', 'minecraft:sniffer_egg', - 'minecraft:elytra', 'minecraft:structure_block', 'minecraft:jigsaw', 'minecraft:sculk_sensor', @@ -713,7 +712,110 @@ global.MINECRAFT_DISABLED_ITEMS = [ 'minecraft:raw_gold_block', 'minecraft:raw_copper_block', 'minecraft:compass', - '/spawn_egg/' + 'minecraft:iron_bars', +]; + +global.MINECRAFT_HIDED_ITEMS = [ + '/spawn_egg/', + + 'minecraft:crimson_stem', + 'minecraft:crimson_hyphae', + 'minecraft:stripped_crimson_stem', + 'minecraft:stripped_crimson_hyphae', + 'minecraft:crimson_planks', + 'minecraft:crimson_stairs', + 'minecraft:crimson_slab', + 'minecraft:crimson_fence', + 'minecraft:crimson_fence_gate', + 'minecraft:crimson_door', + 'minecraft:crimson_trapdoor', + 'minecraft:crimson_pressure_plate', + 'minecraft:crimson_button', + + 'minecraft:warped_stem', + 'minecraft:warped_hyphae', + 'minecraft:stripped_warped_stem', + 'minecraft:stripped_warped_hyphae', + 'minecraft:warped_planks', + 'minecraft:warped_stairs', + 'minecraft:warped_slab', + 'minecraft:warped_fence', + 'minecraft:warped_fence_gate', + 'minecraft:warped_door', + 'minecraft:warped_trapdoor', + 'minecraft:warped_pressure_plate', + 'minecraft:warped_button', + + 'minecraft:polished_blackstone_bricks', + 'minecraft:cracked_polished_blackstone_bricks', + 'minecraft:polished_blackstone_brick_stairs', + 'minecraft:polished_blackstone_brick_slab', + 'minecraft:polished_blackstone_brick_wall', + 'minecraft:netherrack', + 'minecraft:nether_bricks', + 'minecraft:cracked_nether_bricks', + 'minecraft:nether_brick_stairs', + 'minecraft:nether_brick_slab', + 'minecraft:nether_brick_wall', + 'minecraft:nether_brick_fence', + 'minecraft:chiseled_nether_bricks', + 'minecraft:red_nether_bricks', + 'minecraft:red_nether_brick_stairs', + 'minecraft:red_nether_brick_slab', + 'minecraft:red_nether_brick_wall', + 'minecraft:basalt', + 'minecraft:smooth_basalt', + 'minecraft:polished_basalt', + 'minecraft:blackstone', + 'minecraft:gilded_blackstone', + 'minecraft:blackstone_stairs', + 'minecraft:blackstone_slab', + 'minecraft:blackstone_wall', + 'minecraft:chiseled_polished_blackstone', + 'minecraft:polished_blackstone', + 'minecraft:polished_blackstone_stairs', + 'minecraft:polished_blackstone_slab', + 'minecraft:polished_blackstone_wall', + 'minecraft:polished_blackstone_pressure_plate', + 'minecraft:polished_blackstone_button', + + 'minecraft:exposed_copper', + 'minecraft:exposed_cut_copper', + 'minecraft:exposed_cut_copper_stairs', + 'minecraft:exposed_cut_copper_slab', + 'minecraft:weathered_copper', + 'minecraft:weathered_cut_copper', + 'minecraft:weathered_cut_copper_stairs', + 'minecraft:weathered_cut_copper_slab', + 'minecraft:oxidized_copper', + 'minecraft:oxidized_cut_copper', + 'minecraft:oxidized_cut_copper_stairs', + 'minecraft:oxidized_cut_copper_slab', + + 'minecraft:crying_obsidian', + 'minecraft:crimson_nylium', + 'minecraft:warped_nylium', + 'minecraft:soul_sand', + 'minecraft:soul_soil', + 'minecraft:nether_wart_block', + 'minecraft:warped_wart_block', + 'minecraft:shroomlight', + 'minecraft:crimson_fungus', + 'minecraft:piglin_head', + 'minecraft:zombie_head', + 'minecraft:skeleton_skull', + 'minecraft:nether_sprouts', + 'minecraft:warped_roots', + 'minecraft:dragon_head', + 'minecraft:creeper_head', + 'minecraft:wither_skeleton_skull', + 'minecraft:weeping_vines', + 'minecraft:crimson_roots', + 'minecraft:nether_brick', + 'minecraft:nether_wart', + 'minecraft:twisting_vines', + 'minecraft:warped_fungus', + 'minecraft:respawn_anchor', ]; global.VANILLA_WOOD_TYPES = [