diff --git a/.gitignore b/.gitignore index d51d19a43..290ccbcf3 100644 --- a/.gitignore +++ b/.gitignore @@ -118,4 +118,6 @@ config/ftbquests/qusets/chapters/control* !config/naturescompass-common.toml !config/oei !config/railways-client.toml -!config/tconstruct-common.toml \ No newline at end of file +!config/tconstruct-common.toml +config/jei/ingredient-list-mod-sort-order.ini +config/jei/ingredient-list-mod-sort-order.ini diff --git a/Developer/planning_documents/2.5.0/detailed_recipes/EternalSnowstorm.md b/Developer/planning_documents/2.5.0/detailed_recipes/EternalSnowstorm.md index 932899f11..509cdea70 100644 --- a/Developer/planning_documents/2.5.0/detailed_recipes/EternalSnowstorm.md +++ b/Developer/planning_documents/2.5.0/detailed_recipes/EternalSnowstorm.md @@ -19,6 +19,7 @@ A A M => 4x A A A: #工业铁板 // 有一点太贵了，改成4个怎么样 +// 溜槽就完全没有任何机械零件的东西，别构件了 **1x1抽屉** AAA @@ -69,7 +70,7 @@ B: 皮革/丝绢 ABA BMB => 2x ABA -A: #铁板 +A: #铁板 // 别忘了AE2设备需要的是银 B: 石英玻璃 ## 铜构件 @@ -88,7 +89,7 @@ B: 石英玻璃 工业铁板 **分液池** -Create Deco的铁网格? +Create Deco的铁网格? // 别，合成复杂，建议铁栅栏 铜机壳 铜质构件 diff --git a/Developer/planning_documents/2.5.0/detailed_recipes/RC.md b/Developer/planning_documents/2.5.0/detailed_recipes/RC.md index 8cf1de764..e63fb3e31 100644 --- a/Developer/planning_documents/2.5.0/detailed_recipes/RC.md +++ b/Developer/planning_documents/2.5.0/detailed_recipes/RC.md @@ -118,10 +118,10 @@ P X: #木板 **起重机取物器** -X -C M -X: #木板 +C +X +X: 齿轮 **置物台** P diff --git a/config/fancymenu/assets/cmi32.png b/config/fancymenu/assets/cmi32.png new file mode 100644 index 000000000..96af6d405 Binary files /dev/null and b/config/fancymenu/assets/cmi32.png differ diff --git a/config/fancymenu/assets/minecraft_title_2.png b/config/fancymenu/assets/minecraft_title_2.png new file mode 100644 index 000000000..b1f3722fd Binary files /dev/null and b/config/fancymenu/assets/minecraft_title_2.png differ diff --git a/config/fancymenu/customizablemenus.txt b/config/fancymenu/customizablemenus.txt index 2bc634ff5..657d419c4 100644 --- a/config/fancymenu/customizablemenus.txt +++ b/config/fancymenu/customizablemenus.txt @@ -87,3 +87,6 @@ net.minecraft.client.gui.screens.GenericDirtMessageScreen { net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen { } +net.minecraft.client.gui.screens.PauseScreen { +} + diff --git a/config/fancymenu/customization/pause_screen_layout.txt b/config/fancymenu/customization/pause_screen_layout.txt new file mode 100644 index 000000000..96c001a3f --- /dev/null +++ b/config/fancymenu/customization/pause_screen_layout.txt @@ -0,0 +1,883 @@ +type = fancymenu_layout + +layout-meta { + identifier = pause_screen + render_custom_elements_behind_vanilla = false + last_edited_time = 1771154638262 + is_enabled = true + randommode = false + randomgroup = 1 + randomonlyfirsttime = false + layout_index = 0 + [loading_requirement_container_meta:d783da5e-758a-4fd8-a45b-e5396f0cc971-1771154629550] = [groups:][instances:] +} + +customization { + action = backgroundoptions + keepaspectratio = false +} + +scroll_list_customization { + preserve_scroll_list_header_footer_aspect_ratio = true + render_scroll_list_header_shadow = true + render_scroll_list_footer_shadow = true + show_scroll_list_header_footer_preview_in_editor = false + repeat_scroll_list_header_texture = false + repeat_scroll_list_footer_texture = false + show_screen_background_overlay_on_custom_background = false + apply_vanilla_background_blur = false +} + +layout_action_executable_blocks { +} + +element { + source = [source:local]/config/fancymenu/assets/info.png + repeat_texture = false + nine_slice_texture = false + nine_slice_texture_border_x = 5 + nine_slice_texture_border_y = 5 + image_tint = #FFFFFF + restart_animated_on_menu_load = false + element_type = image + instance_identifier = 0e1cb01c-2b80-4725-b8d7-0636a26a8446-1771154055177 + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 1920 + auto_sizing_base_screen_height = 1011 + sticky_anchor = false + anchor_point = bottom-right + x = -177 + y = -50 + width = 173 + height = 44 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = a1d21dec-36b4-4ae9-b1ef-3f15c00e2d04-1771154055177 + [loading_requirement_container_meta:a1d21dec-36b4-4ae9-b1ef-3f15c00e2d04-1771154055177] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false +} + +element { + source = [source:local]/config/fancymenu/assets/cmi32.png + repeat_texture = false + nine_slice_texture = false + nine_slice_texture_border_x = 5 + nine_slice_texture_border_y = 5 + image_tint = #FFFFFF + restart_animated_on_menu_load = false + element_type = image + instance_identifier = 312aacf6-d630-40b3-93cd-800865621133-1771154257074 + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = true + auto_sizing_base_screen_width = 1920 + auto_sizing_base_screen_height = 1011 + sticky_anchor = false + anchor_point = top-left + x = 6 + y = 5 + width = 128 + height = 128 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = 72a793a5-8d2a-46e6-a840-0e0bdf44b255-1771154257074 + [loading_requirement_container_meta:72a793a5-8d2a-46e6-a840-0e0bdf44b255-1771154257074] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false +} + +vanilla_button { + button_element_executable_block_identifier = 574e0c60-554e-4a1b-beb5-79bec3ee3e6b-1771154042373 + [executable_block:574e0c60-554e-4a1b-beb5-79bec3ee3e6b-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = c341191b-7bb0-4cab-adbf-4f090525b237-1771154042373 + [loading_requirement_container_meta:c341191b-7bb0-4cab-adbf-4f090525b237-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = pause_send_feedback_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 218 + y = 134 + width = 98 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = 3cda6433-d9a1-4b01-b1ad-df0fcd6351b8-1771154042373 + [loading_requirement_container_meta:3cda6433-d9a1-4b01-b1ad-df0fcd6351b8-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = d8cc6fcf-dae4-474f-aec7-d606b8cb4de8-1771154042373 + [executable_block:d8cc6fcf-dae4-474f-aec7-d606b8cb4de8-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 94f81814-0753-458f-9db4-63b31a4033d1-1771154042373 + [loading_requirement_container_meta:94f81814-0753-458f-9db4-63b31a4033d1-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = pause_options_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 218 + y = 158 + width = 98 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = bc12346f-70a6-4df2-9074-f5a26a4912aa-1771154042373 + [loading_requirement_container_meta:bc12346f-70a6-4df2-9074-f5a26a4912aa-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = e9fde2e7-4f68-4eaf-8785-536b9f9b9b94-1771154042373 + [executable_block:e9fde2e7-4f68-4eaf-8785-536b9f9b9b94-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 9020e3f6-fec4-4537-8fb4-98f5a0eca0cf-1771154042373 + [loading_requirement_container_meta:9020e3f6-fec4-4537-8fb4-98f5a0eca0cf-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = pause_return_to_game_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 218 + y = 86 + width = 204 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = a4f70281-e37f-460c-8c8a-e84688939280-1771154042373 + [loading_requirement_container_meta:a4f70281-e37f-460c-8c8a-e84688939280-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = 60a07254-99cb-496b-9dfb-3edf55aa8b68-1771154042373 + [executable_block:60a07254-99cb-496b-9dfb-3edf55aa8b68-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 7e989e32-3178-4a59-8f22-e522f44e6504-1771154042373 + [loading_requirement_container_meta:7e989e32-3178-4a59-8f22-e522f44e6504-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = 374276 + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 194 + y = 110 + width = 20 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = 410610c7-d2a7-4767-84cf-ebd03fa089c2-1771154042373 + [loading_requirement_container_meta:410610c7-d2a7-4767-84cf-ebd03fa089c2-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = d18d1574-be46-4454-a0ef-d4c9a4fd1ab8-1771154042373 + [executable_block:d18d1574-be46-4454-a0ef-d4c9a4fd1ab8-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = b995fd2d-78a5-4204-82c7-dad879920cd0-1771154042373 + [loading_requirement_container_meta:b995fd2d-78a5-4204-82c7-dad879920cd0-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = pause_disconnect_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 218 + y = 206 + width = 204 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = 550213f8-887b-4d18-aea0-7ddcccc6d4e8-1771154042373 + [loading_requirement_container_meta:550213f8-887b-4d18-aea0-7ddcccc6d4e8-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = 810e7d2d-ce71-4f86-86d0-7b7748e7b0a1-1771154042373 + [executable_block:810e7d2d-ce71-4f86-86d0-7b7748e7b0a1-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 9230a482-6ded-40df-95e3-465808b3fc09-1771154042373 + [loading_requirement_container_meta:9230a482-6ded-40df-95e3-465808b3fc09-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = pause_advancements_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 218 + y = 110 + width = 98 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = 0608f978-76b4-4193-9ff6-3f7f0f13f8ad-1771154042373 + [loading_requirement_container_meta:0608f978-76b4-4193-9ff6-3f7f0f13f8ad-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = d9bf52f2-2eb0-4be4-8132-37fe562bdd27-1771154042373 + [executable_block:d9bf52f2-2eb0-4be4-8132-37fe562bdd27-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 8a571d2c-419d-46e3-abd9-35e963f035f8-1771154042373 + [loading_requirement_container_meta:8a571d2c-419d-46e3-abd9-35e963f035f8-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = pause_report_bugs_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 324 + y = 134 + width = 98 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = b7653bb1-2dc0-4b00-bd12-a2549c76565f-1771154042373 + [loading_requirement_container_meta:b7653bb1-2dc0-4b00-bd12-a2549c76565f-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = c4140740-e261-450b-a820-61475fe262d6-1771154042373 + [executable_block:c4140740-e261-450b-a820-61475fe262d6-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = dbe9592f-c30a-4ad2-a3b6-c204167ff3b0-1771154042373 + [loading_requirement_container_meta:dbe9592f-c30a-4ad2-a3b6-c204167ff3b0-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = 374300 + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 194 + y = 134 + width = 20 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = ded69036-8276-4849-bd75-f2c4a0e842e4-1771154042373 + [loading_requirement_container_meta:ded69036-8276-4849-bd75-f2c4a0e842e4-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = da27aff7-25b9-42b2-b3bb-d6fca2554cff-1771154042373 + [executable_block:da27aff7-25b9-42b2-b3bb-d6fca2554cff-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 5edf3b8e-2d92-408e-98d3-7a5ed2f19070-1771154042373 + [loading_requirement_container_meta:5edf3b8e-2d92-408e-98d3-7a5ed2f19070-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = pause_share_to_lan_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 324 + y = 158 + width = 98 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = 8e9d3787-f2c1-42d0-875d-b22d753011a9-1771154042373 + [loading_requirement_container_meta:8e9d3787-f2c1-42d0-875d-b22d753011a9-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = 0a44c8d7-e6e5-4346-8e41-c212d6273791-1771154042373 + [executable_block:0a44c8d7-e6e5-4346-8e41-c212d6273791-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 9a9bba98-acfe-43c4-a821-591d246e4a6e-1771154042373 + [loading_requirement_container_meta:9a9bba98-acfe-43c4-a821-591d246e4a6e-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = 40 + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 0 + y = 40 + width = 640 + height = 9 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = 458f15a9-6059-4f75-b3f1-ea59320f9a54-1771154042373 + [loading_requirement_container_meta:458f15a9-6059-4f75-b3f1-ea59320f9a54-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = 403a940e-1e44-4c4e-ac4a-1e40bcb3241c-1771154042373 + [executable_block:403a940e-1e44-4c4e-ac4a-1e40bcb3241c-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = 2af89e75-2096-4e21-b773-194142a842e4-1771154042373 + [loading_requirement_container_meta:2af89e75-2096-4e21-b773-194142a842e4-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = 398348 + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 218 + y = 182 + width = 204 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = 3897897a-c625-4d8c-a932-bd267e2c68c2-1771154042373 + [loading_requirement_container_meta:3897897a-c625-4d8c-a932-bd267e2c68c2-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + +vanilla_button { + button_element_executable_block_identifier = f0ed6215-9c26-4bec-a10f-b1a5d4a187de-1771154042373 + [executable_block:f0ed6215-9c26-4bec-a10f-b1a5d4a187de-1771154042373][type:generic] = [executables:] + restartbackgroundanimations = true + nine_slice_custom_background = false + nine_slice_border_x = 5 + nine_slice_border_y = 5 + navigatable = true + widget_active_state_requirement_container_identifier = a95214dd-db94-4723-bcd3-620470d24dd9-1771154042373 + [loading_requirement_container_meta:a95214dd-db94-4723-bcd3-620470d24dd9-1771154042373] = [groups:][instances:] + is_template = false + template_apply_width = false + template_apply_height = false + template_apply_posx = false + template_apply_posy = false + template_apply_opacity = false + template_apply_visibility = false + template_apply_label = false + template_share_with = buttons + nine_slice_slider_handle = false + nine_slice_slider_handle_border_x = 5 + nine_slice_slider_handle_border_y = 5 + element_type = vanilla_button + instance_identifier = pause_stats_button + appearance_delay = no_delay + appearance_delay_seconds = 1.0 + fade_in_v2 = no_fading + fade_in_speed = 1.0 + fade_out = no_fading + fade_out_speed = 1.0 + base_opacity = 1.0 + auto_sizing = false + auto_sizing_base_screen_width = 0 + auto_sizing_base_screen_height = 0 + sticky_anchor = false + anchor_point = vanilla + x = 324 + y = 110 + width = 98 + height = 20 + stretch_x = false + stretch_y = false + stay_on_screen = true + element_loading_requirement_container_identifier = da6a47fd-2ba1-485c-bf90-1cec8391e84a-1771154042373 + [loading_requirement_container_meta:da6a47fd-2ba1-485c-bf90-1cec8391e84a-1771154042373] = [groups:][instances:] + enable_parallax = false + parallax_intensity_v2 = 0.5 + invert_parallax = false + animated_offset_x = 0 + animated_offset_y = 0 + load_once_per_session = false + in_editor_color = #FFC800FF + layer_hidden_in_editor = false + rotation_degrees = 0.0 + advanced_rotation_mode = false + vertical_tilt_degrees = 0.0 + advanced_vertical_tilt_mode = false + horizontal_tilt_degrees = 0.0 + advanced_horizontal_tilt_mode = false + is_hidden = false + automated_button_clicks = 0 +} + diff --git a/config/fancymenu/options.txt b/config/fancymenu/options.txt index 269074eed..355f281f6 100644 --- a/config/fancymenu/options.txt +++ b/config/fancymenu/options.txt @@ -63,7 +63,7 @@ B:enable_element_tilting_controls = 'true'; ##[ui] -F:ui_scale = '4.0'; +F:ui_scale = '2.0'; B:play_ui_click_sounds = 'true'; B:enable_ui_text_shadow = 'true'; I:context_menu_hover_open_speed = '1'; diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator.json new file mode 100644 index 000000000..d886187cb --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator.json @@ -0,0 +1,53 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/comparator", + "slab": "block/smooth_stone", + "top": "block/comparator", + "unlit": "block/redstone_torch_off", + "lit": "block/redstone_torch" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 4, 2, 11 ], + "to": [ 6, 7, 13 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + }, + { "from": [ 10, 2, 11 ], + "to": [ 12, 7, 13 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 5, 4 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 9 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 9 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 9 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 9 ], "texture": "#unlit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator_on.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator_on.json new file mode 100644 index 000000000..00133846d --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator_on.json @@ -0,0 +1,151 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/comparator_on", + "slab": "block/smooth_stone", + "top": "block/comparator_on", + "unlit": "block/redstone_torch_off", + "lit": "block/redstone_torch" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 4, 2, 11 ], + "to": [ 6, 7, 13 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 5, 4 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 9 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 9 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 9 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 9 ], "texture": "#unlit" } + } + }, + { "from": [ 10, 2, 11 ], + "to": [ 12, 7, 13 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 1.5, 10.5 ], + "to": [ 6.5, 4.5, 13.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 7.5, 10.5 ], + "to": [ 6.5, 10.5, 13.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 7.5 ], + "to": [ 6.5, 7.5, 10.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 13.5 ], + "to": [ 6.5, 7.5, 16.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 0.5, 4.5, 10.5 ], + "to": [ 3.5, 7.5, 13.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 10.5 ], + "to": [ 9.5, 7.5, 13.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 1.5, 10.5 ], + "to": [ 12.5, 4.5, 13.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 7.5, 10.5 ], + "to": [ 12.5, 10.5, 13.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 7.5 ], + "to": [ 12.5, 7.5, 10.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 13.5 ], + "to": [ 12.5, 7.5, 16.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 10.5 ], + "to": [ 9.5, 7.5, 13.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 12.5, 4.5, 10.5 ], + "to": [ 15.5, 7.5, 13.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator_on_subtract.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator_on_subtract.json new file mode 100644 index 000000000..7d86c2ba1 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator_on_subtract.json @@ -0,0 +1,200 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/comparator_on", + "slab": "block/smooth_stone", + "top": "block/comparator_on", + "unlit": "block/redstone_torch_off", + "lit": "block/redstone_torch" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 5, 4 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 9 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 9 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 9 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 9 ], "texture": "#lit" } + } + }, + { "from": [ 4, 2, 11 ], + "to": [ 6, 7, 13 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { "from": [ 10, 2, 11 ], + "to": [ 12, 7, 13 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 1.5, 10.5 ], + "to": [ 6.5, 4.5, 13.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 7.5, 10.5 ], + "to": [ 6.5, 10.5, 13.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 7.5 ], + "to": [ 6.5, 7.5, 10.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 13.5 ], + "to": [ 6.5, 7.5, 16.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 0.5, 4.5, 10.5 ], + "to": [ 3.5, 7.5, 13.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 10.5 ], + "to": [ 9.5, 7.5, 13.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 1.5, 10.5 ], + "to": [ 12.5, 4.5, 13.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 7.5, 10.5 ], + "to": [ 12.5, 10.5, 13.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 7.5 ], + "to": [ 12.5, 7.5, 10.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 13.5 ], + "to": [ 12.5, 7.5, 16.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 10.5 ], + "to": [ 9.5, 7.5, 13.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 12.5, 4.5, 10.5 ], + "to": [ 15.5, 7.5, 13.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, -0.5, 1.5 ], + "to": [ 9.5, 2.5, 4.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 5.5, 1.5 ], + "to": [ 9.5, 8.5, 4.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 2.5, -1.5 ], + "to": [ 9.5, 5.5, 1.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 2.5, 4.5 ], + "to": [ 9.5, 5.5, 7.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 2.5, 1.5 ], + "to": [ 6.5, 5.5, 4.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 2.5, 1.5 ], + "to": [ 12.5, 5.5, 4.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator_subtract.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator_subtract.json new file mode 100644 index 000000000..1119d3702 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/comparator_subtract.json @@ -0,0 +1,102 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/comparator", + "slab": "block/smooth_stone", + "top": "block/comparator", + "unlit": "block/redstone_torch_off", + "lit": "block/redstone_torch" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 4, 2, 11 ], + "to": [ 6, 7, 13 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + }, + { "from": [ 10, 2, 11 ], + "to": [ 12, 7, 13 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 5, 4 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 9 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 9 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 9 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 9 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, -0.5, 1.5 ], + "to": [ 9.5, 2.5, 4.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 5.5, 1.5 ], + "to": [ 9.5, 8.5, 4.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 2.5, -1.5 ], + "to": [ 9.5, 5.5, 1.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 2.5, 4.5 ], + "to": [ 9.5, 5.5, 7.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 2.5, 1.5 ], + "to": [ 6.5, 5.5, 4.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 2.5, 1.5 ], + "to": [ 12.5, 5.5, 4.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 5, 7, 6 ], "texture": "#lit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_torch.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_torch.json new file mode 100644 index 000000000..b43534310 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_redstone_torch", + "textures": { + "torch": "minecraft:block/redstone_torch" + } +} \ No newline at end of file diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_torch_off.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_torch_off.json new file mode 100644 index 000000000..a0686d2d3 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_torch_off.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_torch_unlit", + "textures": { + "torch": "minecraft:block/redstone_torch_off" + } +} \ No newline at end of file diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_wall_torch.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_wall_torch.json new file mode 100644 index 000000000..6373dfb5e --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_wall_torch.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_redstone_torch_wall", + "textures": { + "torch": "minecraft:block/redstone_torch" + } +} \ No newline at end of file diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_wall_torch_off.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_wall_torch_off.json new file mode 100644 index 000000000..0e0889f66 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/redstone_wall_torch_off.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:block/template_torch_wall_unlit", + "textures": { + "torch": "minecraft:block/redstone_torch_off" + } +} \ No newline at end of file diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick.json new file mode 100644 index 000000000..d360b571f --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick.json @@ -0,0 +1,42 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater", + "slab": "block/smooth_stone", + "top": "block/repeater", + "unlit": "block/redstone_torch_off" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 7, 2, 6 ], + "to": [ 9, 7, 8 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick_locked.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick_locked.json new file mode 100644 index 000000000..e264b0c17 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick_locked.json @@ -0,0 +1,43 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater", + "slab": "block/smooth_stone", + "top": "block/repeater", + "lock": "block/bedrock", + "unlit": "block/redstone_torch_off" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 2, 2, 6 ], + "to": [ 14, 4, 8 ], + "faces": { + "up": { "uv": [ 7, 2, 9, 14 ], "texture": "#lock", "rotation": 90 }, + "north": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "south": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "west": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" }, + "east": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick_on.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick_on.json new file mode 100644 index 000000000..2d5dd932c --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick_on.json @@ -0,0 +1,140 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater_on", + "slab": "block/smooth_stone", + "top": "block/repeater_on", + "lit": "block/redstone_torch" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 7, 2, 6 ], + "to": [ 9, 7, 8 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 1.5 ], + "to": [ 9.5, 4.5, 4.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 1.5 ], + "to": [ 9.5, 10.5, 4.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, -1.5 ], + "to": [ 9.5, 7.5, 1.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 4.5 ], + "to": [ 9.5, 7.5, 7.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 1.5 ], + "to": [ 6.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 1.5 ], + "to": [ 12.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 5.5 ], + "to": [ 9.5, 4.5, 8.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 5.5 ], + "to": [ 9.5, 10.5, 8.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 2.5 ], + "to": [ 9.5, 7.5, 5.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 8.5 ], + "to": [ 9.5, 7.5, 11.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 5.5 ], + "to": [ 6.5, 7.5, 8.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 5.5 ], + "to": [ 12.5, 7.5, 8.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick_on_locked.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick_on_locked.json new file mode 100644 index 000000000..44e53d81c --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_1tick_on_locked.json @@ -0,0 +1,92 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater_on", + "slab": "block/smooth_stone", + "top": "block/repeater_on", + "lit": "block/redstone_torch", + "lock": "block/bedrock" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 2, 2, 6 ], + "to": [ 14, 4, 8 ], + "faces": { + "up": { "uv": [ 7, 2, 9, 14 ], "texture": "#lock", "rotation": 90 }, + "north": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "south": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "west": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" }, + "east": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 1.5 ], + "to": [ 9.5, 4.5, 4.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 1.5 ], + "to": [ 9.5, 10.5, 4.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, -1.5 ], + "to": [ 9.5, 7.5, 1.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 4.5 ], + "to": [ 9.5, 7.5, 7.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 1.5 ], + "to": [ 6.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 1.5 ], + "to": [ 12.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick.json new file mode 100644 index 000000000..833c187b5 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick.json @@ -0,0 +1,42 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater", + "slab": "block/smooth_stone", + "top": "block/repeater", + "unlit": "block/redstone_torch_off" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 7, 2, 8 ], + "to": [ 9, 7, 10 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick_locked.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick_locked.json new file mode 100644 index 000000000..47c5337aa --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick_locked.json @@ -0,0 +1,43 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater", + "slab": "block/smooth_stone", + "top": "block/repeater", + "lock": "block/bedrock", + "unlit": "block/redstone_torch_off" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 2, 2, 8 ], + "to": [ 14, 4, 10 ], + "faces": { + "up": { "uv": [ 7, 2, 9, 14 ], "texture": "#lock", "rotation": 90 }, + "north": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "south": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "west": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" }, + "east": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick_on.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick_on.json new file mode 100644 index 000000000..e7285624b --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick_on.json @@ -0,0 +1,140 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater_on", + "slab": "block/smooth_stone", + "top": "block/repeater_on", + "lit": "block/redstone_torch" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 7, 2, 8 ], + "to": [ 9, 7, 10 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 1.5 ], + "to": [ 9.5, 4.5, 4.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 1.5 ], + "to": [ 9.5, 10.5, 4.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, -1.5 ], + "to": [ 9.5, 7.5, 1.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 4.5 ], + "to": [ 9.5, 7.5, 7.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 1.5 ], + "to": [ 6.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 1.5 ], + "to": [ 12.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 7.5 ], + "to": [ 9.5, 4.5, 10.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 7.5 ], + "to": [ 9.5, 10.5, 10.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 4.5 ], + "to": [ 9.5, 7.5, 7.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 10.5 ], + "to": [ 9.5, 7.5, 13.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 7.5 ], + "to": [ 6.5, 7.5, 10.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 7.5 ], + "to": [ 12.5, 7.5, 10.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick_on_locked.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick_on_locked.json new file mode 100644 index 000000000..897e0bfc3 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_2tick_on_locked.json @@ -0,0 +1,92 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater_on", + "slab": "block/smooth_stone", + "top": "block/repeater_on", + "lit": "block/redstone_torch", + "lock": "block/bedrock" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 2, 2, 8 ], + "to": [ 14, 4, 10 ], + "faces": { + "up": { "uv": [ 7, 2, 9, 14 ], "texture": "#lock", "rotation": 90 }, + "north": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "south": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "west": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" }, + "east": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 1.5 ], + "to": [ 9.5, 4.5, 4.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 1.5 ], + "to": [ 9.5, 10.5, 4.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, -1.5 ], + "to": [ 9.5, 7.5, 1.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 4.5 ], + "to": [ 9.5, 7.5, 7.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 1.5 ], + "to": [ 6.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 1.5 ], + "to": [ 12.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick.json new file mode 100644 index 000000000..ea1d922c4 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick.json @@ -0,0 +1,42 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater", + "slab": "block/smooth_stone", + "top": "block/repeater", + "unlit": "block/redstone_torch_off" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 7, 2, 10 ], + "to": [ 9, 7, 12 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick_locked.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick_locked.json new file mode 100644 index 000000000..13ce208d9 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick_locked.json @@ -0,0 +1,43 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater", + "slab": "block/smooth_stone", + "top": "block/repeater", + "lock": "block/bedrock", + "unlit": "block/redstone_torch_off" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 2, 2, 10 ], + "to": [ 14, 4, 12 ], + "faces": { + "up": { "uv": [ 7, 2, 9, 14 ], "texture": "#lock", "rotation": 90 }, + "north": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "south": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "west": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" }, + "east": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick_on.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick_on.json new file mode 100644 index 000000000..fd1413834 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick_on.json @@ -0,0 +1,140 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater_on", + "slab": "block/smooth_stone", + "top": "block/repeater_on", + "lit": "block/redstone_torch" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 7, 2, 10 ], + "to": [ 9, 7, 12 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 1.5 ], + "to": [ 9.5, 4.5, 4.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 1.5 ], + "to": [ 9.5, 10.5, 4.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, -1.5 ], + "to": [ 9.5, 7.5, 1.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 4.5 ], + "to": [ 9.5, 7.5, 7.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 1.5 ], + "to": [ 6.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 1.5 ], + "to": [ 12.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 9.5 ], + "to": [ 9.5, 4.5, 12.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 9.5 ], + "to": [ 9.5, 10.5, 12.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 6.5 ], + "to": [ 9.5, 7.5, 9.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 12.5 ], + "to": [ 9.5, 7.5, 15.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 9.5 ], + "to": [ 6.5, 7.5, 12.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 9.5 ], + "to": [ 12.5, 7.5, 12.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick_on_locked.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick_on_locked.json new file mode 100644 index 000000000..d5aca9eb9 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_3tick_on_locked.json @@ -0,0 +1,92 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater_on", + "slab": "block/smooth_stone", + "top": "block/repeater_on", + "lit": "block/redstone_torch", + "lock": "block/bedrock" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 2, 2, 10 ], + "to": [ 14, 4, 12 ], + "faces": { + "up": { "uv": [ 7, 2, 9, 14 ], "texture": "#lock", "rotation": 90 }, + "north": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "south": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "west": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" }, + "east": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 1.5 ], + "to": [ 9.5, 4.5, 4.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 1.5 ], + "to": [ 9.5, 10.5, 4.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, -1.5 ], + "to": [ 9.5, 7.5, 1.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 4.5 ], + "to": [ 9.5, 7.5, 7.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 1.5 ], + "to": [ 6.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 1.5 ], + "to": [ 12.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick.json new file mode 100644 index 000000000..f8b357b6e --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick.json @@ -0,0 +1,42 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater", + "slab": "block/smooth_stone", + "top": "block/repeater", + "unlit": "block/redstone_torch_off" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 7, 2, 12 ], + "to": [ 9, 7, 14 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick_locked.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick_locked.json new file mode 100644 index 000000000..7a6aca0c0 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick_locked.json @@ -0,0 +1,43 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater", + "slab": "block/smooth_stone", + "top": "block/repeater", + "lock": "block/bedrock", + "unlit": "block/redstone_torch_off" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 2, 2, 12 ], + "to": [ 14, 4, 14 ], + "faces": { + "up": { "uv": [ 7, 2, 9, 14 ], "texture": "#lock", "rotation": 90 }, + "north": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "south": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "west": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" }, + "east": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#unlit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#unlit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick_on.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick_on.json new file mode 100644 index 000000000..01cd32881 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick_on.json @@ -0,0 +1,140 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater_on", + "slab": "block/smooth_stone", + "top": "block/repeater_on", + "lit": "block/redstone_torch" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 7, 2, 12 ], + "to": [ 9, 7, 14 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 1.5 ], + "to": [ 9.5, 4.5, 4.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 1.5 ], + "to": [ 9.5, 10.5, 4.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, -1.5 ], + "to": [ 9.5, 7.5, 1.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 4.5 ], + "to": [ 9.5, 7.5, 7.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 1.5 ], + "to": [ 6.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 1.5 ], + "to": [ 12.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 11.5 ], + "to": [ 9.5, 4.5, 14.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 11.5 ], + "to": [ 9.5, 10.5, 14.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 8.5 ], + "to": [ 9.5, 7.5, 11.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 14.5 ], + "to": [ 9.5, 7.5, 17.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 11.5 ], + "to": [ 6.5, 7.5, 14.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 11.5 ], + "to": [ 12.5, 7.5, 14.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick_on_locked.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick_on_locked.json new file mode 100644 index 000000000..6ad187cde --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/repeater_4tick_on_locked.json @@ -0,0 +1,92 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "block/repeater_on", + "slab": "block/smooth_stone", + "top": "block/repeater_on", + "lit": "block/redstone_torch", + "lock": "block/bedrock" + }, + "elements": [ + { "from": [ 0, 0, 0 ], + "to": [ 16, 2, 16 ], + "faces": { + "down": { "uv": [ 0, 0, 16, 16 ], "texture": "#slab", "cullface": "down" }, + "up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top" }, + "north": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "north" }, + "south": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "south" }, + "west": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "west" }, + "east": { "uv": [ 0, 14, 16, 16 ], "texture": "#slab", "cullface": "east" } + } + }, + { "from": [ 2, 2, 12 ], + "to": [ 14, 4, 14 ], + "faces": { + "up": { "uv": [ 7, 2, 9, 14 ], "texture": "#lock", "rotation": 90 }, + "north": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "south": { "uv": [ 2, 7, 14, 9 ], "texture": "#lock" }, + "west": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" }, + "east": { "uv": [ 6, 7, 8, 9 ], "texture": "#lock" } + } + }, + { "from": [ 7, 2, 2 ], + "to": [ 9, 7, 4 ], + "shade": false, + "faces": { + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#lit" }, + "north": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "south": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "west": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" }, + "east": { "uv": [ 7, 6, 9, 11 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 1.5, 1.5 ], + "to": [ 9.5, 4.5, 4.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 7.5, 1.5 ], + "to": [ 9.5, 10.5, 4.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, -1.5 ], + "to": [ 9.5, 7.5, 1.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 6.5, 4.5, 4.5 ], + "to": [ 9.5, 7.5, 7.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#lit" } + } + }, + { + "from": [ 3.5, 4.5, 1.5 ], + "to": [ 6.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#lit" } + } + }, + { + "from": [ 9.5, 4.5, 1.5 ], + "to": [ 12.5, 7.5, 4.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#lit" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_redstone_torch.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_redstone_torch.json new file mode 100644 index 000000000..de6022cd6 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_redstone_torch.json @@ -0,0 +1,68 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#torch" + }, + "elements": [ + { "from": [ 7, 0, 7 ], + "to": [ 9, 10, 9 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 13, 9, 15 ], "texture": "#torch", "cullface": "down" }, + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#torch" }, + "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" } + } + }, + { + "from": [ 6.5, 7.5, 6.5 ], + "to": [ 9.5, 7.5, 9.5 ], + "shade": false, + "faces": { + "up": { "uv": [ 8, 5, 9, 6 ], "texture": "#torch" } + } + }, + { + "from": [ 6.5, 10.5, 6.5 ], + "to": [ 9.5, 10.5, 9.5 ], + "shade": false, + "faces": { + "down": { "uv": [ 7, 5, 8, 6 ], "texture": "#torch" } + } + }, + { + "from": [ 6.5, 7.5, 6.5 ], + "to": [ 9.5, 10.5, 6.5 ], + "shade": false, + "faces": { + "south": { "uv": [ 9, 6, 10, 7 ], "texture": "#torch" } + } + }, + { + "from": [ 9.5, 7.5, 6.5 ], + "to": [ 9.5, 10.5, 9.5 ], + "shade": false, + "faces": { + "west": { "uv": [ 6, 7, 7, 8 ], "texture": "#torch" } + } + }, + { + "from": [ 6.5, 7.5, 9.5 ], + "to": [ 9.5, 10.5, 9.5 ], + "shade": false, + "faces": { + "north": { "uv": [ 6, 6, 7, 7 ], "texture": "#torch" } + } + }, + { + "from": [ 6.5, 7.5, 6.5 ], + "to": [ 6.5, 10.5, 9.5 ], + "shade": false, + "faces": { + "east": { "uv": [ 9, 7, 10, 8 ], "texture": "#torch" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_redstone_torch_wall.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_redstone_torch_wall.json new file mode 100644 index 000000000..6c11497f5 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_redstone_torch_wall.json @@ -0,0 +1,75 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#torch" + }, + "elements": [ + { "from": [ -1, 3.5, 7 ], + "to": [ 1, 13.5, 9 ], + "rotation": { "origin": [ 0, 3.5, 8 ], "axis": "z", "angle": -22.5 }, + "shade": false, + "faces": { + "down": { "uv": [ 7, 13, 9, 15 ], "texture": "#torch" }, + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#torch" }, + "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" } + } + }, + { + "from": [ -1.5, 8, 6.5 ], + "to": [ 1.5, 11, 9.5 ], + "shade": false, + "rotation": { "origin": [ 0, 3.5, 8 ], "axis": "z", "angle": -22.5 }, + "faces": { + "up": { "uv": [ 6, 5, 7, 6 ], "texture": "#torch" } + } + }, + { + "from": [ -1.5, 14, 6.5 ], + "to": [ 1.5, 17, 9.5 ], + "shade": false, + "rotation": { "origin": [ 0, 3.5, 8 ], "axis": "z", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 6, 5, 7, 6 ], "texture": "#torch" } + } + }, + { + "from": [ -1.5, 11, 3.5 ], + "to": [ 1.5, 14, 6.5 ], + "shade": false, + "rotation": { "origin": [ 0, 3.5, 8 ], "axis": "z", "angle": -22.5 }, + "faces": { + "south": { "uv": [ 6, 5, 7, 6 ], "texture": "#torch" } + } + }, + { + "from": [ 1.5, 11, 6.5 ], + "to": [ 4.5, 14, 9.5 ], + "shade": false, + "rotation": { "origin": [ 0, 3.5, 8 ], "axis": "z", "angle": -22.5 }, + "faces": { + "west": { "uv": [ 6, 5, 7, 6 ], "texture": "#torch" } + } + }, + { + "from": [ -1.5, 11, 9.5 ], + "to": [ 1.5, 14, 12.5 ], + "shade": false, + "rotation": { "origin": [ 0, 3.5, 8 ], "axis": "z", "angle": -22.5 }, + "faces": { + "north": { "uv": [ 6, 5, 7, 6 ], "texture": "#torch" } + } + }, + { + "from": [ -4.5, 11, 6.5 ], + "to": [ -1.5, 14, 9.5 ], + "shade": false, + "rotation": { "origin": [ 0, 3.5, 8 ], "axis": "z", "angle": -22.5 }, + "faces": { + "east": { "uv": [ 6, 5, 7, 6 ], "texture": "#torch" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_torch_unlit.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_torch_unlit.json new file mode 100644 index 000000000..ef0829e27 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_torch_unlit.json @@ -0,0 +1,19 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#torch" + }, + "elements": [ + { "from": [ 7, 0, 7 ], + "to": [ 9, 10, 9 ], + "faces": { + "down": { "uv": [ 7, 13, 9, 15 ], "texture": "#torch", "cullface": "down" }, + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#torch" }, + "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_torch_wall_unlit.json b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_torch_wall_unlit.json new file mode 100644 index 000000000..3b11230ba --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/models/block/template_torch_wall_unlit.json @@ -0,0 +1,20 @@ +{ + "ambientocclusion": false, + "textures": { + "particle": "#torch" + }, + "elements": [ + { "from": [ -1, 3.5, 7 ], + "to": [ 1, 13.5, 9 ], + "rotation": { "origin": [ 0, 3.5, 8 ], "axis": "z", "angle": -22.5 }, + "faces": { + "down": { "uv": [ 7, 13, 9, 15 ], "texture": "#torch" }, + "up": { "uv": [ 7, 6, 9, 8 ], "texture": "#torch" }, + "north": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "east": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "south": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" }, + "west": { "uv": [ 7, 6, 9, 16 ], "texture": "#torch" } + } + } + ] +} diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/textures/block/redstone_torch.png b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/textures/block/redstone_torch.png new file mode 100644 index 000000000..56d3cf701 Binary files /dev/null and b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/textures/block/redstone_torch.png differ diff --git a/config/openloader/resources/Newly Redstone Torch/assets/minecraft/textures/block/redstone_torch_off.png b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/textures/block/redstone_torch_off.png new file mode 100644 index 000000000..05af7b92a Binary files /dev/null and b/config/openloader/resources/Newly Redstone Torch/assets/minecraft/textures/block/redstone_torch_off.png differ diff --git a/config/openloader/resources/Newly Redstone Torch/pack.mcmeta b/config/openloader/resources/Newly Redstone Torch/pack.mcmeta new file mode 100644 index 000000000..b1b1678a5 --- /dev/null +++ b/config/openloader/resources/Newly Redstone Torch/pack.mcmeta @@ -0,0 +1,6 @@ +{ + "pack": { + "pack_format": 15, + "description": "§b1.21.X Redstone Torch" + } +} \ No newline at end of file diff --git a/config/openloader/resources/Newly Redstone Torch/pack.png b/config/openloader/resources/Newly Redstone Torch/pack.png new file mode 100644 index 000000000..13f19f45a Binary files /dev/null and b/config/openloader/resources/Newly Redstone Torch/pack.png differ diff --git a/kubejs/assets/cmi/textures/block/dev/re_construction_e.png b/kubejs/assets/cmi/textures/block/dev/re_construction_e.png index 84a1d0ba2..5d28ee625 100644 Binary files a/kubejs/assets/cmi/textures/block/dev/re_construction_e.png and b/kubejs/assets/cmi/textures/block/dev/re_construction_e.png differ diff --git a/kubejs/server_scripts/recipes/rc_temp/AndesiteMachine.js b/kubejs/server_scripts/recipes/rc_temp/AndesiteMachine.js new file mode 100644 index 000000000..531120cc4 --- /dev/null +++ b/kubejs/server_scripts/recipes/rc_temp/AndesiteMachine.js @@ -0,0 +1,241 @@ +ServerEvents.recipes((event) => { + let { kubejs } = event.recipes + const MECH = Mechanism.ANDESITE.COM + const CASHING = "create:andesite_casing" + + // 动力辊压机 + kubejs.shaped("create:mechanical_press", [ + "M", + "C", + "X" + ], { + M: MECH, + C: CASHING, + X: ["#forge:storage_blocks/iron", "#forge:storage_blocks/zinc"] + }).id("create:crafting/kinetics/mechanical_press") + + // 动力搅拌器 + kubejs.shaped("create:mechanical_mixer", [ + "M", + "C", + "X" + ], { + M: MECH, + C: CASHING, + X: "create:whisk", + }).id("create:crafting/kinetics/mechanical_mixer") + + // 鼓风机 + kubejs.shaped("create:encased_fan", [ + "M", + "C", + "X" + ], { + M: MECH, + C: CASHING, + X: "create:propeller", + }).id("create:crafting/kinetics/encased_fan") + + // 扇叶 + kubejs.shaped("create:propeller", [ + " A ", + "ABA", + " A " + ], { + A: ["#forge:plates/iron", "#forge:plates/zinc"], + B: "#forge:ingots/andesite_alloy" + }).id("create:crafting/kinetics/propeller") + + // 烤箱用鼓风机 + kubejs.shapeless("ratatouille:oven_fan", + "create:encased_fan" + ).id("ratatouille:oven_fan") + + // 鼓风机 ←- 烤箱用鼓风机 + kubejs.shapeless("create:encased_fan", + "ratatouille:oven_fan" + ) + + // 工作盆盖板 + kubejs.shaped("createdieselgenerators:basin_lid", [ + "ABA", + "C C" + ], { + A: "#forge:plates/andesite_alloy", + B: "#forge:ingots/andesite_alloy", + C: "thermal:rubberwood_planks" + }) + + // 动力轴承 + kubejs.shaped("create:mechanical_bearing", [ + "X", + "C", + "M" + ], { + M: MECH, + C: CASHING, + X: "#minecraft:planks", + }).id("create:crafting/kinetics/mechanical_bearing") + + // 风车轴承 + kubejs.shaped("create:windmill_bearing", [ + "X", + "C", + "M" + ], { + M: MECH, + C: CASHING, + X: "#forge:plates/stone", + }).id("create:crafting/kinetics/windmill_bearing") + + // 动力活塞 + kubejs.shaped("create:mechanical_piston", [ + "M", + "C", + "X" + ], { + M: MECH, + C: CASHING, + X: "create:piston_extension_pole", + }).id("create:crafting/kinetics/mechanical_piston") + + // 起重机轴承 + kubejs.shaped("create:gantry_carriage", [ + "M", + "C", + "X" + ], { + M: MECH, + C: CASHING, + X: "#create:cogwheel", + }).id("create:crafting/kinetics/gantry_carriage") + + // 弹射置物台 + kubejs.shapeless("create:weighted_ejector", + ["create:depot", + MECH + ]) + + // 石磨 + kubejs.shaped("create:millstone", [ + "M", + "C", + "X" + ], { + M: MECH, + C: CASHING, + X: "#forge:stone", + }).id("create:crafting/kinetics/millstone") + + // 动力收割机 + kubejs.shaped("create:mechanical_harvester", [ + "XXX", + " C ", + " M " + ], { + M: MECH, + C: CASHING, + X: "#forge:rods/andesite", + }).id("create:crafting/kinetics/mechanical_harvester") + + // 动力犁 + kubejs.shaped("create:mechanical_plough", [ + "XXX", + " C ", + " M " + ], { + M: MECH, + C: CASHING, + X: "#forge:plates/andesite_alloy", + }).id("create:crafting/kinetics/mechanical_plough") + + // 脱粒机 + kubejs.shaped("ratatouille:thresher", [ + " Y ", + "XMX", + " C " + ], { + M: MECH, + C: CASHING, + X: "#forge:plates/andesite_alloy", + Y: "#forge:plates/andesite_alloy", + }).id("ratatouille:thresher") + + // 动力压路机 + kubejs.shaped("2x create:mechanical_roller", [ + "CX ", + "XMX", + " X " + ], { + M: MECH, + C: CASHING, + X: "#forge:plates/andesite_alloy", + }).id("create:crafting/kinetics/mechanical_roller") + + // 动力脱模机 + kubejs.shaped("ratatouille:mechanical_demolder", [ + "M", + "C", + "X" + ], { + M: MECH, + C: CASHING, + X: "#forge:slimeballs", + }).id("ratatouille:mechanical_demolder") + + // 振动台 + kubejs.shaped("vintageimprovements:vibrating_table", [ + " Y ", + "XMX", + " C " + ], { + M: MECH, + C: CASHING, + X: "#vintageimprovements:springs/andesite", + Y: "#minecraft:planks", + }).id("vintageimprovements:craft/vibrating_table") + + // 轧机 + kubejs.shaped("createaddition:rolling_mill", [ + " M ", + "XYX", + " C " + ], { + M: MECH, + C: CASHING, + X: "#forge:plates/andesite_alloy", + Y: "#create:shaft", + }).id("createaddition:crafting/rolling_mill") + + // 卷簧机 + kubejs.shaped("vintageimprovements:spring_coiling_machine", [ + "X", + "C", + "M" + ], { + M: MECH, + C: CASHING, + X: "vintageimprovements:spring_coiling_machine_wheel", + }).id("vintageimprovements:craft/spring_coiling_machine") + + // 卷簧轮 + kubejs.shaped("vintageimprovements:spring_coiling_machine_wheel", [ + " A ", + "ABA", + " A " + ], { + A: ["#forge:plates/iron","#forge:plates/andesite_alloy"], + B: "#forge:ingots/andesite_alloy" + }).id("vintageimprovements:craft/spring_coiling_machine_wheel") + + // 冲压机 + kubejs.shaped("vintageimprovements:curving_press", [ + "M", + "C", + "X" + ], { + M: MECH, + C: CASHING, + X: ["#forge:plates/iron", "#forge:plates/andesite_alloy"] + }).id("vintageimprovements:craft/curving_press") +}) \ No newline at end of file diff --git a/kubejs/server_scripts/recipes/rc_temp/CopperMachine.js b/kubejs/server_scripts/recipes/rc_temp/CopperMachine.js new file mode 100644 index 000000000..41c04a87e --- /dev/null +++ b/kubejs/server_scripts/recipes/rc_temp/CopperMachine.js @@ -0,0 +1,66 @@ +ServerEvents.recipes((event) => { + let { kubejs } = event.recipes + const MECH = Mechanism.WOODEN.COM + const CASING = "create:copper_casing" + + // 流体元件外壳 + kubejs.shaped("ae2:fluid_cell_housing", [ + "XYX", + "YMY", + "XYX" + ], { + M: MECH, + X: "#forge:plates/copper", + Y: "ae2:quartz_glass" + }).id("ae2:network/cells/fluid_cell_housing") + + // 移动式流体接口 + kubejs.shapeless("create:portable_fluid_interface",[CASING, + MECH, + "#forge:plates/industrial_iron" + ]).id("create:crafting/kinetics/portable_fluid_interface") + + // 分液池 + kubejs.shaped("create:item_drain", [ + "X", + "M", + "C" + ], { + M: MECH, + X: "minecraft:iron_bars", + C: CASING + }).id("create:crafting/kinetics/item_drain") + + // 注液器 + kubejs.shaped("create:spout", [ + "M", + "C", + "X" + ], { + M: MECH, + X: "thermal:cured_rubber", + C: CASING + }).id("create:crafting/kinetics/spout") + + // 软管滑轮 + kubejs.shaped("create:hose_pulley", [ + "C", + "X", + "M" + ], { + M: MECH, + X: "thermal:cured_rubber_block", + C: CASING + }).id("create:crafting/kinetics/hose_pulley") + + // // 灌溉塔 + // kubejs.shaped("create:hose_puyylley", [ + // "AMA", + // "BCB" + // ], { + // M: MECH, + // A: "#forge:plates/copper", + // B: "#forge:rods/copper", + // C: "create:fluid_pipe" + // }).id("create:crafting/kinetics/ley") +}) \ No newline at end of file diff --git a/kubejs/server_scripts/recipes/rc_temp/ReadMe.txt b/kubejs/server_scripts/recipes/rc_temp/ReadMe.txt new file mode 100644 index 000000000..2d4acbb52 --- /dev/null +++ b/kubejs/server_scripts/recipes/rc_temp/ReadMe.txt @@ -0,0 +1 @@ +文件可以转移，此文件夹保留 \ No newline at end of file diff --git a/kubejs/server_scripts/recipes/rc_temp/StoneMachine.js b/kubejs/server_scripts/recipes/rc_temp/StoneMachine.js new file mode 100644 index 000000000..b291e381e --- /dev/null +++ b/kubejs/server_scripts/recipes/rc_temp/StoneMachine.js @@ -0,0 +1,89 @@ +ServerEvents.recipes((event) => { + let { kubejs } = event.recipes + const MECH = Mechanism.STONE.COM + const BRICK = "tconstruct:seared_brick" + const PRISM = "cmi:polished_quartz_prism" + + // 焦黑融化器 + kubejs.shaped("tconstruct:seared_melter", [ + "BXB", + "BMB" + ], { + M: MECH, + B: BRICK, + X: "#tconstruct:gauge" + }).id("tconstruct:smeltery/seared/melter") + + // 焦黑加热器 + kubejs.shaped("tconstruct:seared_heater", [ + "BBB", + "BMB", + "BBB" + ], { + M: MECH, + B: BRICK + }).id("tconstruct:smeltery/seared/heater") + + // 焦黑燃料储罐 + kubejs.shaped("tconstruct:seared_fuel_tank", [ + "BBB", + "BPB", + "BBB" + ], { + P: PRISM, + B: BRICK + }).id("tconstruct:smeltery/seared/fuel_tank") + + // 焦黑材料储罐 + kubejs.shaped("tconstruct:seared_ingot_tank", [ + "BPB", + "BPB", + "BPB" + ], { + P: PRISM, + B: BRICK + }).id("tconstruct:smeltery/seared/ingot_tank") + + // 焦黑燃料量器 + kubejs.shaped("tconstruct:seared_fuel_gauge", [ + "BPB", + "PPP", + "BPB" + ], { + P: PRISM, + B: BRICK + }).id("tconstruct:smeltery/seared/fuel_gauge") + + // 焦黑材料量器 + kubejs.shaped("tconstruct:seared_ingot_gauge", [ + "PBP", + "BPB", + "PBP" + ], { + P: PRISM, + B: BRICK + }).id("tconstruct:smeltery/seared/ingot_gauge") + + // 焦黑玻璃 + kubejs.shaped("tconstruct:seared_glass", [ + "PBP", + "BPB", + "PBP" + ], { + P: PRISM, + B: BRICK + }).id("tconstruct:smeltery/seared/seared_glass") + + // 铸模箱 + kubejs.shaped("tconstruct:cast_chest", [ + "BXB", + "BYB", + "BMB" + ], { + M: MECH, + B: BRICK, + X: "#tconstruct:patterns/reusable", + Y: "#forge:chests" + }).id("tconstruct:tables/cast_chest") + +}) \ No newline at end of file diff --git a/kubejs/server_scripts/recipes/rc_temp/WoodenMachine.js b/kubejs/server_scripts/recipes/rc_temp/WoodenMachine.js new file mode 100644 index 000000000..7d554a119 --- /dev/null +++ b/kubejs/server_scripts/recipes/rc_temp/WoodenMachine.js @@ -0,0 +1,65 @@ +ServerEvents.recipes((event) => { + let { kubejs } = event.recipes + const MECH = Mechanism.WOODEN.COM + + // 漏斗 + kubejs.shaped("minecraft:hopper", [ + "X X", + "XMX", + " X " + ], { + M: MECH, + X: ["#forge:plates/tin","#forge:plates/iron"], + }).id("minecraft:hopper") + + // 溜槽 + kubejs.shaped("2x create:chute", [ + "X", + "Y" + ], { + X: "#forge:ingots/industrial_iron", + Y: "#forge:plates/industrial_iron", + }).id("create:crafting/kinetics/chute") + + // 背包 + // !!! + kubejs.shaped("sophisticatedbackpacks:backpack", [ + "XYX", + "XMX", + "YYY" + ], { + X: "#forge:string", + Y: ["#forge:leather","tconstruct:silky_cloth"] + }).id("sophisticatedbackpacks:backpack") + + // 空白升级 + // !!! + kubejs.shaped("sophisticatedbackpacks:upgrade_base", [ + "XYX", + "YMY", + "XYX" + ], { + X: "#forge:rods/andesite", + Y: ["#forge:leather","tconstruct:silky_cloth"] + }).id("sophisticatedbackpacks:upgrade_base") + + // 移动式存储接口 + kubejs.shapeless("create:portable_storage_interface",[ + "create:andesite_casing", + MECH, + "#forge:plates/industrial_iron" + ]).id("create:crafting/kinetics/portable_storage_interface") + + // ME物品原件外壳 + // !!! + kubejs.shaped("2x ae2:item_cell_housing", [ + "XYX", + "YMY", + "XYX" + ], { + X: "#forge:plates/silver", + Y: "ae2:quartz_glass", + }).id("ae2:network/cells/item_cell_housing") + + +}) \ No newline at end of file