diff --git a/config/fancymenu/config.txt b/config/fancymenu/config.txt new file mode 100644 index 0000000..5246f38 --- /dev/null +++ b/config/fancymenu/config.txt @@ -0,0 +1,75 @@ +##[general] + +[Stop vanilla world music when in a customizable menu.] +B:stopworldmusicwhencustomizable = 'false'; +[If menu background sounds added by FancyMenu should be played when a world is loaded.] +B:playbackgroundsoundsinworld = 'false'; +B:forcefullscreen = 'false'; +[If menu background sounds added by FancyMenu should be played or not.] +B:playbackgroundsounds = 'true'; +[A minecraft restart is required after changing this value.] +B:enablehotkeys = 'false'; +B:playmenumusic = 'true'; +S:variables_to_reset_on_launch = ''; +B:showdebugwarnings = 'true'; +[Sets the default GUI scale on first launch. Useful for modpacks. Cache data is saved in '/mods/fancymenu/'.] +I:defaultguiscale = '3'; + + +##[customization] + +B:advancedmode = 'false'; +B:showcustomizationbuttons = 'false'; + + +##[mainmenu] + +S:copyrightposition = 'bottom-right'; +S:copyrightcolor = '#ffffff'; + + +##[loading] + +B:allowgameintroskip = 'true'; +B:showanimationloadingstatus = 'true'; +S:gameintroanimation = ''; +B:preloadanimations = 'true'; +S:customgameintroskiptext = ''; + + +##[minecraftwindow] + +[A minecraft restart is required after changing this value.] +S:customwindowtitle = ''; +[A minecraft restart is required after changing this value.] +B:customwindowicon = 'false'; + + +##[multiplayer_screen] + +B:show_server_icons = 'true'; + + +##[singleplayer_screen] + +B:show_world_icons = 'true'; + + +##[layouteditor] + +I:gridsize = '10'; +B:editordeleteconfirmation = 'true'; +B:showgrid = 'false'; +[If the warning when trying to move an vanilla button without an orientation should be displayed or not.] +B:showvanillamovewarning = 'true'; + + +##[ui] + +B:show_unicode_warning = 'true'; +F:uiscale = '1.0'; + + +##[compatibility] + +B:allow_level_registry_interactions = 'true'; \ No newline at end of file diff --git a/config/fancymenu/customizablemenus.txt b/config/fancymenu/customizablemenus.txt new file mode 100644 index 0000000..07261b5 --- /dev/null +++ b/config/fancymenu/customizablemenus.txt @@ -0,0 +1,5 @@ +type = customizablemenus + +net.minecraft.client.gui.GuiMainMenu { +} + diff --git a/config/fancymenu/customization/default-gtlite.txt b/config/fancymenu/customization/default-gtlite.txt new file mode 100644 index 0000000..e233aca --- /dev/null +++ b/config/fancymenu/customization/default-gtlite.txt @@ -0,0 +1,293 @@ +type = menu + +customization-meta { + identifier = net.minecraft.client.gui.GuiMainMenu + randomgroup = 1 + renderorder = foreground + randommode = false + randomonlyfirsttime = false +} + +customization { + keepaspectratio = false + action = backgroundoptions +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_multiplayer_button% + orientation = mid-left + x = 180 + action = movebutton + y = -47 +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_multiplayer_button% + width = 90 + action = resizebutton + height = 90 +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_multiplayer_button% + loopbackgroundanimations = true + restartbackgroundanimations = true + action = setbuttontexture + backgroundhovered = resources/fancymenu/textures/mainmenu.button.1.png + backgroundnormal = resources/fancymenu/textures/mainmenu.button.0.png +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_options_button% + orientation = mid-left + x = 420 + action = movebutton + y = -47 +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_options_button% + width = 90 + action = resizebutton + height = 90 +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_options_button% + loopbackgroundanimations = true + restartbackgroundanimations = true + action = setbuttontexture + backgroundhovered = resources/fancymenu/textures/mainmenu.button.1.png + backgroundnormal = resources/fancymenu/textures/mainmenu.button.0.png +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_quit_button% + orientation = mid-left + x = 540 + action = movebutton + y = -2 +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_quit_button% + width = 45 + action = resizebutton + height = 45 +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_quit_button% + loopbackgroundanimations = true + restartbackgroundanimations = true + action = setbuttontexture + backgroundhovered = resources/fancymenu/textures/mainmenu.button.exit.1.png + backgroundnormal = resources/fancymenu/textures/mainmenu.button.exit.0.png +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_language_button% + orientation = mid-left + x = 540 + action = movebutton + y = -47 +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_language_button% + width = 45 + action = resizebutton + height = 45 +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_language_button% + loopbackgroundanimations = true + restartbackgroundanimations = true + action = setbuttontexture + backgroundhovered = resources/fancymenu/textures/mainmenu.button.i18n.1.png + backgroundnormal = resources/fancymenu/textures/mainmenu.button.i18n.0.png +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_singleplayer_button% + orientation = mid-left + x = 60 + action = movebutton + y = -47 +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_singleplayer_button% + width = 90 + action = resizebutton + height = 90 +} + +customization { + identifier = %id=button_compatibility_id:mc_titlescreen_singleplayer_button% + loopbackgroundanimations = true + restartbackgroundanimations = true + action = setbuttontexture + backgroundhovered = resources/fancymenu/textures/mainmenu.button.1.png + backgroundnormal = resources/fancymenu/textures/mainmenu.button.0.png +} + +customization { + identifier = %id=button_compatibility_id:forge_titlescreen_mods_button% + orientation = mid-left + x = 300 + action = movebutton + y = -47 +} + +customization { + identifier = %id=button_compatibility_id:forge_titlescreen_mods_button% + width = 90 + action = resizebutton + height = 90 +} + +customization { + identifier = %id=button_compatibility_id:forge_titlescreen_mods_button% + loopbackgroundanimations = true + restartbackgroundanimations = true + action = setbuttontexture + backgroundhovered = resources/fancymenu/textures/mainmenu.button.1.png + backgroundnormal = resources/fancymenu/textures/mainmenu.button.0.png +} + +customization { + orientation = top-left + hidden = true + x = 230 + width = 180 + action = deep_customization_element:title_screen_forge_top + actionid = 682cf1a6-5899-4bd3-a08f-ed5aff5c08951780927625470 + y = 4 + height = 19 +} + +customization { + orientation = top-left + hidden = true + x = 2 + width = 119 + action = deep_customization_element:title_screen_branding + actionid = c8d6e25a-f4aa-4412-9ca1-128fbda657491780927625482 + y = 282 + height = 50 +} + +customization { + orientation = top-left + hidden = true + x = 482 + width = 157 + action = deep_customization_element:title_screen_forge_copyright + actionid = a92d328f-7767-4d9d-bbd2-c6eb700efd2e1780927625482 + y = 314 + height = 9 +} + +customization { + orientation = top-left + hidden = true + x = 423 + width = 13 + action = deep_customization_element:title_screen_realms_notification + actionid = 800961b8-2420-44c6-9660-ede1490a02411780927625482 + y = 183 + height = 13 +} + +customization { + orientation = top-left + hidden = true + x = 183 + width = 274 + action = deep_customization_element:title_screen_logo + actionid = 0d125c5d-8884-4883-97bd-8c7b147e8ee61780927625482 + y = 30 + height = 52 +} + +customization { + orientation = original + splash_color = #ffff00 + hidden = true + x = 0 + width = 60 + splash_rotation = -20 + action = deep_customization_element:title_screen_splash + actionid = cae63628-947f-473b-a8a6-6559684fcbee1780927625483 + y = 0 + height = 30 +} + +customization { + path = resources/fancymenu/textures/mainmenu.logo.png + orientation = top-left + x = 72 + width = 64 + actionid = c441f430-510f-4203-b8a8-0ce61f03eac61780930071199 + action = addtexture + y = 36 + height = 64 +} + +customization { + orientation = top-left + enable_scrolling = true + shadow = true + scale = 5.0 + source = GregTech Lite + text_border = 0 + case_mode = normal + source_mode = direct + line_spacing = 1 + x = 176 + width = 321 + action = custom_layout_element:fancymenu_customization_item_text + actionid = 8f354ffc-305b-4624-ad1b-0c525308405a1780930238361 + y = 35 + alignment = left + height = 66 +} + +customization { + orientation = top-left + enable_scrolling = true + shadow = true + scale = 1.0 + source = Minecraft {"placeholder":"mcversion"} Forge 14.23.5.2860%n%GregTech Lite Modpack (Nightly Build Version)%n%Loaded Mods: {"placeholder":"totalmods"}%n%RAM: {"placeholder":"usedram"} MB / {"placeholder":"maxram"} MB + text_border = 0 + case_mode = normal + source_mode = direct + line_spacing = 1 + x = 300 + width = 234 + action = custom_layout_element:fancymenu_customization_item_text + actionid = 5ec45cfe-c341-4195-998b-710df0a3f4881780930601955 + y = 240 + alignment = left + height = 44 +} + +customization { + orientation = top-left + restartbackgroundanimations = true + buttonaction = openlink;https://github.com/GregTechLite/GregTech-Lite-Modpack%btnaction_splitter_fm% + backgroundhovered = resources/fancymenu/textures/mainmenu.button.link.1.png + description = GitHub + label = + loopbackgroundanimations = true + x = 180 + width = 45 + action = addbutton + actionid = 7ac4c153-1c6b-4a58-86d8-5ee6c8fe22aa1780930762154 + y = 240 + backgroundnormal = resources/fancymenu/textures/mainmenu.button.link.0.png + height = 45 +} + diff --git a/config/fancymenu/menu_identifiers.db b/config/fancymenu/menu_identifiers.db new file mode 100644 index 0000000..b49a84d --- /dev/null +++ b/config/fancymenu/menu_identifiers.db @@ -0,0 +1,309 @@ +type = menu_identifier_database + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiMainMenu + forge_1.16 = net.minecraft.client.gui.screen.MainMenuScreen + forge_1.17 = net.minecraft.client.gui.screens.TitleScreen + fabric = net.minecraft.class_442 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiWorldSelection + forge_1.16 = net.minecraft.client.gui.screen.WorldSelectionScreen + forge_1.17 = net.minecraft.client.gui.screens.worldselection.SelectWorldScreen + fabric = net.minecraft.class_526 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiCreateWorld + forge_1.16 = net.minecraft.client.gui.screen.CreateWorldScreen + forge_1.17 = net.minecraft.client.gui.screens.worldselection.CreateWorldScreen + fabric = net.minecraft.class_525 +} + +identifier-group { + forge_1.16 = net.minecraft.client.gui.screen.MultiplayerWarningScreen + forge_1.17 = net.minecraft.client.gui.screens.multiplayer.SafetyScreen + fabric = net.minecraft.class_4749 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiMultiplayer + forge_1.16 = net.minecraft.client.gui.screen.MultiplayerScreen + forge_1.17 = net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen + fabric = net.minecraft.class_500 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiScreenAddServer + forge_1.16 = net.minecraft.client.gui.screen.AddServerScreen + forge_1.17 = net.minecraft.client.gui.screens.EditServerScreen + fabric = net.minecraft.class_422 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiScreenRealmsProxy + forge_1.16 = com.mojang.realmsclient.gui.screens.RealmsClientOutdatedScreen + forge_1.17 = [placeholder] + fabric = net.minecraft.class_4387 +} + +identifier-group { + forge_1.17 = com.mojang.realmsclient.RealmsMainScreen + fabric = net.minecraft.class_4325 +} + +identifier-group { + forge_1.12 = net.minecraftforge.fml.client.GuiModList + forge_1.16 = net.minecraftforge.fml.client.gui.screen.ModListScreen + forge_1.17 = net.minecraftforge.fmlclient.gui.screen.ModListScreen +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiOptions + forge_1.16 = net.minecraft.client.gui.screen.OptionsScreen + forge_1.17 = net.minecraft.client.gui.screens.OptionsScreen + fabric = net.minecraft.class_429 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiCustomizeSkin + forge_1.16 = net.minecraft.client.gui.screen.CustomizeSkinScreen + forge_1.17 = net.minecraft.client.gui.screens.SkinCustomizationScreen + fabric = net.minecraft.class_440 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiScreenOptionsSounds + forge_1.16 = net.minecraft.client.gui.screen.OptionsSoundsScreen + forge_1.17 = net.minecraft.client.gui.screens.SoundOptionsScreen + fabric = net.minecraft.class_443 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiVideoSettings + forge_1.16 = net.minecraft.client.gui.screen.VideoSettingsScreen + forge_1.17 = net.minecraft.client.gui.screens.VideoSettingsScreen + fabric = net.minecraft.class_446 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiControls + forge_1.16 = net.minecraft.client.gui.screen.ControlsScreen + forge_1.17 = net.minecraft.client.gui.screens.controls.ControlsScreen + fabric = net.minecraft.class_458 +} + +identifier-group { + forge_1.16 = net.minecraft.client.gui.screen.MouseSettingsScreen + forge_1.17 = net.minecraft.client.gui.screens.MouseSettingsScreen + fabric = net.minecraft.class_4288 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiLanguage + forge_1.16 = net.minecraft.client.gui.screen.LanguageScreen + forge_1.17 = net.minecraft.client.gui.screens.LanguageSelectScreen + fabric = net.minecraft.class_426 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.ScreenChatOptions + forge_1.16 = net.minecraft.client.gui.screen.ChatOptionsScreen + forge_1.17 = net.minecraft.client.gui.screens.ChatOptionsScreen + fabric = net.minecraft.class_404 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiScreenResourcePacks + forge_1.16 = net.minecraft.client.gui.screen.PackScreen + forge_1.17 = net.minecraft.client.gui.screens.packs.PackSelectionScreen + fabric = net.minecraft.class_5375 +} + +identifier-group { + forge_1.16 = net.minecraft.client.gui.AccessibilityScreen + forge_1.17 = net.minecraft.client.gui.screens.AccessibilityOptionsScreen + fabric = net.minecraft.class_4189 +} + +identifier-group { + forge_1.12 = [placeholder] + forge_1.16 = net.minecraft.client.gui.screen.ConfirmOpenLinkScreen + forge_1.17 = net.minecraft.client.gui.screens.ConfirmLinkScreen + fabric = net.minecraft.class_407 +} + +identifier-group { + forge_1.16 = net.minecraft.client.gui.screen.EditGamerulesScreen + forge_1.17 = net.minecraft.client.gui.screens.worldselection.EditGameRulesScreen + fabric = net.minecraft.class_5235 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.advancements.GuiScreenAdvancements + forge_1.16 = net.minecraft.client.gui.advancements.AdvancementsScreen + forge_1.17 = net.minecraft.client.gui.screens.advancements.AdvancementsScreen + fabric = net.minecraft.class_457 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.achievement.GuiStats + forge_1.16 = net.minecraft.client.gui.screen.StatsScreen + forge_1.17 = net.minecraft.client.gui.screens.achievement.StatsScreen + fabric = net.minecraft.class_447 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.inventory.GuiContainerCreative + forge_1.16 = net.minecraft.client.gui.screen.inventory.CreativeScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen + fabric = net.minecraft.class_481 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.inventory.GuiInventory + forge_1.16 = net.minecraft.client.gui.screen.inventory.InventoryScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.CreativeModeInventoryScreen + fabric = net.minecraft.class_490 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.inventory.GuiCrafting + forge_1.16 = net.minecraft.client.gui.screen.inventory.CraftingScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.CraftingScreen + fabric = net.minecraft.class_479 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiEnchantment + forge_1.16 = net.minecraft.client.gui.screen.EnchantmentScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.EnchantmentScreen + fabric = net.minecraft.class_486 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiRepair + forge_1.16 = net.minecraft.client.gui.screen.inventory.AnvilScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.AnvilScreen + fabric = net.minecraft.class_471 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.inventory.GuiChest + forge_1.16 = net.minecraft.client.gui.screen.inventory.ChestScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.ContainerScreen + fabric = net.minecraft.class_476 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.inventory.GuiBrewingStand + forge_1.16 = net.minecraft.client.gui.screen.inventory.BrewingStandScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.BrewingStandScreen + fabric = net.minecraft.class_472 +} + +identifier-group { + forge_1.16 = net.minecraft.client.gui.screen.inventory.SmithingTableScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.SmithingScreen + fabric = net.minecraft.class_4895 +} + +identifier-group { + forge_1.16 = net.minecraft.client.gui.screen.inventory.BlastFurnaceScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.BlastFurnaceScreen + fabric = net.minecraft.class_3871 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.inventory.GuiFurnace + forge_1.16 = net.minecraft.client.gui.screen.inventory.FurnaceScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.FurnaceScreen + fabric = net.minecraft.class_3873 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiHopper + forge_1.16 = net.minecraft.client.gui.screen.HopperScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.HopperScreen + fabric = net.minecraft.class_488 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.inventory.GuiDispenser + forge_1.16 = net.minecraft.client.gui.screen.inventory.DispenserScreen + forge_1.17 = net.minecraft.client.gui.screens.inventory.DispenserScreen + fabric = net.minecraft.class_480 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiGameOver + forge_1.16 = net.minecraft.client.gui.screen.DeathScreen + forge_1.17 = net.minecraft.client.gui.screens.DeathScreen + fabric = net.minecraft.class_418 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiYesNo + forge_1.16 = net.minecraft.client.gui.screen.ConfirmScreen + forge_1.17 = net.minecraft.client.gui.screens.ConfirmScreen + fabric = net.minecraft.class_410 +} + +identifier-group { + forge_1.12 = net.minecraft.client.gui.GuiIngameMenu + forge_1.16 = net.minecraft.client.gui.screen.IngameMenuScreen + forge_1.17 = net.minecraft.client.gui.screens.PauseScreen + fabric = net.minecraft.class_433 +} + +identifier-group { + forge_1.16 = net.minecraft.client.gui.screen.WorldLoadProgressScreen + forge_1.17 = net.minecraft.client.gui.screens.LevelLoadingScreen + fabric = net.minecraft.class_3928 +} + +identifier-group { + forge_1.12 = [placeholder] + forge_1.16 = net.minecraft.client.gui.screen.DirtMessageScreen + forge_1.17 = net.minecraft.client.gui.screens.GenericDirtMessageScreen + fabric = net.minecraft.class_424 +} + +identifier-group { + forge_1.16 = net.minecraft.client.gui.screen.GamemodeSelectionScreen + forge_1.17 = net.minecraft.client.gui.screens.debug.GameModeSwitcherScreen + fabric = net.minecraft.class_5289 +} + +identifier-group { + forge_1.16 = net.minecraft.client.gui.screen.LoomScreen + forge_1.18 = net.minecraft.client.gui.screens.inventory.LoomScreen + fabric = net.minecraft.class_494 +} + +identifier-group { + forge_1.18 = net.minecraft.client.gui.screens.controls.KeyBindsScreen + fabric = net.minecraft.class_6599 +} + +identifier-group { + forge_1.18 = net.minecraft.client.gui.screens.MouseSettingsScreen + fabric = net.minecraft.class_4288 +} + + + + + + + + + + + + + + + + diff --git a/groovy/event/TooltipEventHandler.groovy b/groovy/event/TooltipEventHandler.groovy index c396dfd..bff778f 100644 --- a/groovy/event/TooltipEventHandler.groovy +++ b/groovy/event/TooltipEventHandler.groovy @@ -1,4 +1,4 @@ -import com.morphismmc.morphismlib.util.I18nUtil +import gregtech.api.util.LocalizationUtils import net.minecraftforge.event.entity.player.ItemTooltipEvent import static gregtech.api.GTValues.MV @@ -8,7 +8,7 @@ log.info("Starting to add Item Tooltips...") event_manager.listen { ItemTooltipEvent event -> if (event.getItemStack() in item('appliedenergistics2:quartz_glass')) - event.getToolTip() << I18nUtil.format('gtlitecore.tooltip.glass_tier', VNF[MV]) + event.getToolTip() << LocalizationUtils.format('gtlitecore.tooltip.glass_tier', VNF[MV]) if (event.getItemStack() in item('appliedenergistics2:quartz_vibrant_glass')) - event.getToolTip() << I18nUtil.format('gtlitecore.tooltip.glass_tier', VNF[MV]) + event.getToolTip() << LocalizationUtils.format('gtlitecore.tooltip.glass_tier', VNF[MV]) } \ No newline at end of file diff --git a/groovy/loader/recipe/AppliedEnergistics2.groovy b/groovy/loader/recipe/AppliedEnergistics2.groovy index 2fed9fb..3c456a2 100644 --- a/groovy/loader/recipe/AppliedEnergistics2.groovy +++ b/groovy/loader/recipe/AppliedEnergistics2.groovy @@ -1993,6 +1993,7 @@ forming_press.recipeBuilder() .buildAndRegister() // Wireless Booster +crafting.remove('appliedenergistics2:network/wireless_booster') laser_engraver.recipeBuilder() .notConsumable(ore('craftingLensLime')) .inputs(ore('plateEnderPearl')) @@ -2166,7 +2167,7 @@ for (int i = 0; i < 16; i++) { // Glass Cable + Chem Dye -> Colored Glass Cable chemical_bath.recipeBuilder() .inputs(item('appliedenergistics2:part', 16)) - .fluidInputs(fluid('dye_' + dyeColors[i]) * 36) + .fluidInputs(fluid('dye_' + dyeColors[i]) * 18) .outputs(item('appliedenergistics2:part', i)) .EUt(VA[LV]) .duration(TICK) @@ -2186,7 +2187,7 @@ for (int i = 20; i < 36; i++) { // Covered Cable + Chem Dye -> Covered Cable chemical_bath.recipeBuilder() .inputs(item('appliedenergistics2:part', 36)) - .fluidInputs(fluid('dye_' + dyeColors[i - 20]) * 36) + .fluidInputs(fluid('dye_' + dyeColors[i - 20]) * 18) .outputs(item('appliedenergistics2:part', i)) .EUt(VA[LV]) .duration(TICK) @@ -2207,7 +2208,7 @@ for (int i = 40; i < 56; i++) { // Smart Cable + Chem Dye -> Colored Smart Cable chemical_bath.recipeBuilder() .inputs(item('appliedenergistics2:part', 56)) - .fluidInputs(fluid('dye_' + dyeColors[i - 40]) * 36) + .fluidInputs(fluid('dye_' + dyeColors[i - 40]) * 18) .outputs(item('appliedenergistics2:part', i)) .EUt(VA[LV]) .duration(TICK) @@ -2227,7 +2228,7 @@ for (int i = 60; i < 76; i++) { // Dense Cable + Chem Dye -> Colored Dense Cable chemical_bath.recipeBuilder() .inputs(item('appliedenergistics2:part', 76)) - .fluidInputs(fluid('dye_' + dyeColors[i - 60]) * 36) + .fluidInputs(fluid('dye_' + dyeColors[i - 60]) * 18) .outputs(item('appliedenergistics2:part', i)) .EUt(VA[LV]) .duration(TICK) diff --git a/groovy/loader/recipe/BetterQuesting.groovy b/groovy/loader/recipe/BetterQuesting.groovy new file mode 100644 index 0000000..5cbc883 --- /dev/null +++ b/groovy/loader/recipe/BetterQuesting.groovy @@ -0,0 +1,10 @@ +package recipe + +log.info("Starting to load BetterQuesting Recipes...") + +// Questbook +crafting.shapelessBuilder() + .name(resource('gtlite:questbook')) + .input([item('minecraft:book'), item('gtlitecore:gtlite_meta_item_2', 13)]) + .output(item('betterquesting:quest_book')) + .register() \ No newline at end of file diff --git a/groovy/loader/recipe/Chisel.groovy b/groovy/loader/recipe/Chisel.groovy index ff1e0e2..fdec4e3 100644 --- a/groovy/loader/recipe/Chisel.groovy +++ b/groovy/loader/recipe/Chisel.groovy @@ -92,3 +92,8 @@ mods.chisel.carving.addVariation(p2p_tunnels_group, item('appliedenergistics2:pa mods.chisel.carving.addVariation(p2p_tunnels_group, item('appliedenergistics2:part', 467)) // Light mods.chisel.carving.addVariation(p2p_tunnels_group, item('appliedenergistics2:part', 469)) // FE mods.chisel.carving.addVariation(p2p_tunnels_group, item('appliedenergistics2:part', 470)) // GTEU + +// Bedrock +mods.chisel.carving.addGroup(bedrock_group) +mods.chisel.carving.addVariation(bedrock_group, item('minecraft:bedrock')) +mods.chisel.carving.addVariation(bedrock_group, item('gtlitecore:meta_block_compressed_135', 12)) \ No newline at end of file diff --git a/groovy/loader/recipe/GregTechLiteCore.groovy b/groovy/loader/recipe/GregTechLiteCore.groovy index f02b33d..457bec3 100644 --- a/groovy/loader/recipe/GregTechLiteCore.groovy +++ b/groovy/loader/recipe/GregTechLiteCore.groovy @@ -17,4 +17,17 @@ wiremill.recipeBuilder() .outputs(item('minecraft:string') * 4) .EUt(7) // ULV .duration(2 * TICK) - .buildAndRegister() \ No newline at end of file + .buildAndRegister() + +// Drain +crafting.removeByOutput(item('gtlitecore:gtlite_meta_item_1', 116)) +crafting.shapedBuilder() + .name(resource('gtlitecore:drain')) + .shape('SSS', + 'IPI', + 'SSS') + .key('S', ore('stickIron')) + .key('P', ore('pipeSmallFluidSteel')) + .key('I', ore('barsIron')) + .output(item('gtlitecore:gtlite_meta_item_1', 116)) + .register() \ No newline at end of file diff --git a/groovy/loader/recipe/JustEnoughItems.groovy b/groovy/loader/recipe/JustEnoughItems.groovy index 9198d7a..2406ab5 100644 --- a/groovy/loader/recipe/JustEnoughItems.groovy +++ b/groovy/loader/recipe/JustEnoughItems.groovy @@ -37,9 +37,11 @@ mods.jei.ingredient.removeAndHide(item('bq_standard:loot_chest', 101).withNbt([' mods.jei.ingredient.removeAndHide(item('bq_standard:loot_chest', 102)) mods.jei.ingredient.removeAndHide(item('bq_standard:loot_chest', 103).withNbt(['loottable': 'minecraft:chests/simple_dungeon', 'hideLootInfo': (byte) 1])) mods.jei.ingredient.removeAndHide(item('bq_standard:loot_chest', 104).withNbt(['fixedLootList': [['Count': 1, 'Damage': (short) 0, 'id': 'minecraft:stone', 'OreDict': '']], 'hideLootInfo': (byte) 1, 'fixedLootName': 'Item Set'])) +mods.jei.ingredient.removeAndHide(item('betterquesting:extra_life')) +mods.jei.ingredient.removeAndHide(item('betterquesting:extra_life', 1)) +mods.jei.ingredient.removeAndHide(item('betterquesting:extra_life', 2)) // EnderIO - mods.jei.ingredient.removeAndHide(item('enderio:item_material')) // Simple Machine Chassi mods.jei.ingredient.removeAndHide(item('enderio:item_material', 1)) // Industrial Machine Chassis mods.jei.ingredient.removeAndHide(item('enderio:item_material', 2)) // Machine Parts diff --git a/groovy/loader/recipe/ProjectRed.groovy b/groovy/loader/recipe/ProjectRed.groovy index e707d83..18bcd87 100644 --- a/groovy/loader/recipe/ProjectRed.groovy +++ b/groovy/loader/recipe/ProjectRed.groovy @@ -199,7 +199,7 @@ for (int i = 0; i < 16; i++) { chemical_bath.recipeBuilder() .inputs(item('projectred-transmission:wire')) - .fluidInputs(fluid('dye_' + dyeColors[i]) * 36) + .fluidInputs(fluid('dye_' + dyeColors[i]) * 18) .outputs(item('projectred-transmission:wire', i + 1)) .EUt(VA[LV]) .duration(TICK) @@ -229,7 +229,7 @@ for (int i = 0; i < 16; i++) { chemical_bath.recipeBuilder() .inputs(item('projectred-transmission:framed_wire')) - .fluidInputs(fluid('dye_' + dyeColors[i]) * 36) + .fluidInputs(fluid('dye_' + dyeColors[i]) * 18) .outputs(item('projectred-transmission:framed_wire', i + 1)) .EUt(VA[LV]) .duration(TICK) @@ -291,7 +291,7 @@ for (int i = 17; i < 33; i++) { chemical_bath.recipeBuilder() .inputs(item('projectred-transmission:wire', 17)) - .fluidInputs(fluid('dye_' + dyeColors[i - 17]) * 36) + .fluidInputs(fluid('dye_' + dyeColors[i - 17]) * 18) .outputs(item('projectred-transmission:wire', i + 1)) .EUt(VA[LV]) .duration(TICK) @@ -354,7 +354,7 @@ for (int i = 500; i < 516; i++) { chemical_bath.recipeBuilder() .inputs(item('minecraft:glowstone_dust')) - .fluidInputs(fluid('dye_' + dyeColors[i - 500]) * 36) + .fluidInputs(fluid('dye_' + dyeColors[i - 500]) * 18) .outputs(item('projectred-core:resource_item', i)) .EUt(VA[LV]) .duration(TICK) diff --git a/index.toml b/index.toml index 48bd13d..07eaddd 100644 --- a/index.toml +++ b/index.toml @@ -2080,6 +2080,22 @@ hash = "a347a1090de0ccc6373ba2e476938cabb0574edd70f585605da04c74fb74818e" file = "config/enderio/enderio.cfg" hash = "569b4a65449c2f3d364f06752ed3d1befac3d83cea385173eea06c521d49a0ed" +[[files]] +file = "config/fancymenu/config.txt" +hash = "dec62ee16ed6524524df3007d1397b9b5994342220a92f6139a4cb6bf834346e" + +[[files]] +file = "config/fancymenu/customizablemenus.txt" +hash = "6dfe1a1fa3c8bea225b68ea388db57cbce7f373766479e195b8b89104432c6d7" + +[[files]] +file = "config/fancymenu/customization/default-gtlite.txt" +hash = "b040b5844632bf4c389c4e83279172262603213360c5e9104104f7ab4c3f0594" + +[[files]] +file = "config/fancymenu/menu_identifiers.db" +hash = "003a1c89846741e0eb9475089d4ed653896fd08e0b994667fae452b4ad894a72" + [[files]] file = "config/fluiddrawers.cfg" hash = "a9845be03a2b99a5fb389e01d60f71acec618451a73872dd0a6a107c594636d0" @@ -2462,7 +2478,7 @@ hash = "80476d3d3169ff17dc7f772e62cd9debfb6e2426558aabab7cf892c1d8e051ff" [[files]] file = "groovy/event/TooltipEventHandler.groovy" -hash = "357c55860e75ffd6356cb9004b5cbaa27d74a1bc0d06bbb8471081164cd169be" +hash = "9642f696ebcbcaa089f6cb17207c309ec396e8bb8ea282483f408329a991745a" [[files]] file = "groovy/loader/OreDictionaryLoader.groovy" @@ -2474,19 +2490,23 @@ hash = "830bd25835d7de559257f7a312081fcfab880fdf0f3dffcc1d2b6b60feb5c725" [[files]] file = "groovy/loader/recipe/AppliedEnergistics2.groovy" -hash = "929cb2a2dae66263f5bf3f9e4cabbddbf17d853964b99943d0b8f97230a271b1" +hash = "fb54ce8f0a85411c3bef415f7e2363d69a763eb6a65ba77aca68ec3964a9dc90" [[files]] file = "groovy/loader/recipe/BetterBuildersWands.groovy" hash = "e8d85f0a56bc9f5222ffb10068bbb9b2b590cc99b9898d16a8cf172ec4ea96d3" +[[files]] +file = "groovy/loader/recipe/BetterQuesting.groovy" +hash = "b8c4badc0c0f911363959230afab9c6a73c91f69cc11e4d9568c84e337063b05" + [[files]] file = "groovy/loader/recipe/BuildingGadgets.groovy" hash = "3634d1052d476d56f5948d61b1794db0dba092f7866378ef3e8cd3728f1eaa62" [[files]] file = "groovy/loader/recipe/Chisel.groovy" -hash = "ade37f8532433693b2e42fca2f6d81d7a0e4671b9e81c612232308c0599e98e3" +hash = "55327d614d51879e1ee8c9e2382edae4dd7ba8d791c6b992e75977ec048fa5b7" [[files]] file = "groovy/loader/recipe/EnderCore.groovy" @@ -2514,11 +2534,11 @@ hash = "06c481d3c123a6a035354614d37054294744513ba19c4a7f6650c9ca4f337212" [[files]] file = "groovy/loader/recipe/GregTechLiteCore.groovy" -hash = "2fda43c84e3bec5dfbfbcddd9a2cc7dbe83878232f550349c27754730daf63cf" +hash = "4bad8115cfabf14320ddddcb23d38ff200319a874cd20fd96b42ce922b89f01d" [[files]] file = "groovy/loader/recipe/JustEnoughItems.groovy" -hash = "638ab5d8f957f344ec42d077648bf40a9296c7917914105ca7282c5c0b83ab37" +hash = "eef8f70d54c6ec5228dc1a3c553c6915def58dd90eaec182af11e37d35e32e73" [[files]] file = "groovy/loader/recipe/MoreFurnaces.groovy" @@ -2530,7 +2550,7 @@ hash = "0200e0e094ce9c6e952db5315a3e131444624484e5466cb879027d290a5df4c6" [[files]] file = "groovy/loader/recipe/ProjectRed.groovy" -hash = "81cfa18a5c7293f19084bea08215d9264064b629b38fd31cdd8a32fd4c6fb31e" +hash = "29963592ab5099d08ba918ebf93a9f9e812eb5bcee4987c29914864f93da4dfc" [[files]] file = "groovy/loader/recipe/SophisticatedBackpacks.groovy" @@ -2720,6 +2740,11 @@ file = "mods/entangled.pw.toml" hash = "6843e8fbb7c7872902ce42daccc1287428caca3b56742b9e6e33048c9a0653f1" metafile = true +[[files]] +file = "mods/fancymenu.pw.toml" +hash = "a0b9178824a6998223027dbca140b3652300a9140c7ed908db5508c9f4af1902" +metafile = true + [[files]] file = "mods/fluid-drawers.pw.toml" hash = "6f59b412881512ae1339649a4c46cb8406a4ca3d6b7b24705819324b6fd039e4" @@ -2771,7 +2796,7 @@ metafile = true [[files]] file = "mods/gtlitecore-1.0.0.jar" -hash = "8c69479e9a0455b51f2d81ddfd32b5ea964dd928c98c366f6f042e6b2c352305" +hash = "cd892cd0a7134fa641262aa1d1a60da97bffd121eef83518c96fbdd51f48ff01" [[files]] file = "mods/had-enough-characters.pw.toml" @@ -2838,6 +2863,11 @@ file = "mods/kleeslabs.pw.toml" hash = "21e1c7795d5c8cb8d95db171d42dda4fa3065e6bc1e59d6cb5c9b6e44d7008b5" metafile = true +[[files]] +file = "mods/konkrete.pw.toml" +hash = "35d4f2d6f3ee79b918349a01c16e8c7f5c4ffc7c057e1ee1ac2cd5095ee1a8c1" +metafile = true + [[files]] file = "mods/libnine.pw.toml" hash = "aeeca03fc512fffed87f449bc8b631d59f4b95857dc3818492d6af0afd4e00c6" @@ -3076,7 +3106,7 @@ hash = "41fd5d50b33cfd0b98324b4f3a36cbc6456ead6ce54e8c16fe5718be5b93525e" [[files]] file = "resources/betterquesting/lang/zh_cn.lang" -hash = "f6d138dcd27b478ddc03a162e7e095cf46abcfc5598ac0cef775e13584d46e18" +hash = "0213eea9646f613a2380319c4e8402f073848248fcb0257006bc1e820ee5f7ea" [[files]] file = "resources/betterquesting/textures/items/quest_book.png" @@ -3166,6 +3196,42 @@ hash = "ec9744db6e6e382b55919f17b0e52b1abd3af7c519bde8cede561df7f35bcb9d" file = "resources/customloadingscreen/image/gtlite/bg9.png" hash = "221b7efc93262c0ac9d5315bdd096560bdf427c9eecd5ec8f413de91a8f147ba" +[[files]] +file = "resources/fancymenu/textures/mainmenu.button.0.png" +hash = "0153ea8d4102e88d56e1f15ffbaaaafaf54a9cd56d33d143418f4a000833e9db" + +[[files]] +file = "resources/fancymenu/textures/mainmenu.button.1.png" +hash = "ef59e5f08686a9deb9787a166f94450bfbf40984bb6a13661bc4651b70cda1fa" + +[[files]] +file = "resources/fancymenu/textures/mainmenu.button.exit.0.png" +hash = "6e1399b94ce50039129a5ed8d749b3b7ab6bd4a0f164320a3d9b65edce4fa4d8" + +[[files]] +file = "resources/fancymenu/textures/mainmenu.button.exit.1.png" +hash = "03c35ae1f1944e768da0bd3373e7c1d1b0a72ce3674761fd482b633f0ce0af96" + +[[files]] +file = "resources/fancymenu/textures/mainmenu.button.i18n.0.png" +hash = "0236486945385ef2380ac2d78cbaa937e341af80bd8997baac9faef4e87abd80" + +[[files]] +file = "resources/fancymenu/textures/mainmenu.button.i18n.1.png" +hash = "b5ae2969792e4eb4dab71662deb38ba7f7e81d5c8abbb5dc1471be6c1fc4b5c6" + +[[files]] +file = "resources/fancymenu/textures/mainmenu.button.link.0.png" +hash = "0a3f37926b5930dcb0c506e13a2de7c44b8b799d237eecdb75277d65c7c8ec49" + +[[files]] +file = "resources/fancymenu/textures/mainmenu.button.link.1.png" +hash = "cd3a8ff871bf06b93cf6355f0c2d7caac5f2703141110893218605bdb1cd0b2b" + +[[files]] +file = "resources/fancymenu/textures/mainmenu.logo.png" +hash = "5089865fcf1e622ea35fe808bc3f0508f8b8791f4bbc98f064d6ab6071c73a38" + [[files]] file = "resources/forge/lang/zh_cn.lang" hash = "d73251c0b404017c1b1bf9710680edd9a8035ba6d3adaa6d2d6e3ac058bea4a4" diff --git a/mods/fancymenu.pw.toml b/mods/fancymenu.pw.toml new file mode 100644 index 0000000..30bf70d --- /dev/null +++ b/mods/fancymenu.pw.toml @@ -0,0 +1,13 @@ +name = "FancyMenu" +filename = "fancymenu_forge_2.14.9_MC_1.12-1.12.2.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "b85302e855530f799697b2850e70293111f0cdbe" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4655936 +project-id = 367706 diff --git a/mods/gtlitecore-1.0.0.jar b/mods/gtlitecore-1.0.0.jar index e958fea..3941d05 100644 Binary files a/mods/gtlitecore-1.0.0.jar and b/mods/gtlitecore-1.0.0.jar differ diff --git a/mods/konkrete.pw.toml b/mods/konkrete.pw.toml new file mode 100644 index 0000000..851834c --- /dev/null +++ b/mods/konkrete.pw.toml @@ -0,0 +1,13 @@ +name = "Konkrete" +filename = "konkrete_forge_1.6.1_MC_1.12-1.12.2.jar" +side = "both" + +[download] +hash-format = "sha1" +hash = "d8853dbd60fd050709d2d687d875cb0d93806e92" +mode = "metadata:curseforge" + +[update] +[update.curseforge] +file-id = 4514895 +project-id = 410295 diff --git a/pack.toml b/pack.toml index bc65826..7889b2a 100644 --- a/pack.toml +++ b/pack.toml @@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0" [index] file = "index.toml" hash-format = "sha256" -hash = "5223b0ad08269ad9866cd4ad911a145cedde04ac2db99c208ea7089919956a7a" +hash = "d04c80beeaf7edd82614c9ec7d1337e5b274c0366b037e9f21471614cf3d4b95" [versions] forge = "14.23.5.2860" diff --git a/resources/betterquesting/lang/zh_cn.lang b/resources/betterquesting/lang/zh_cn.lang index 7c10cd1..307832b 100644 --- a/resources/betterquesting/lang/zh_cn.lang +++ b/resources/betterquesting/lang/zh_cn.lang @@ -264,4 +264,7 @@ betterquesting.notification.tooltip=切换任务通知 betterquesting.context.add_task=增加任务目标 betterquesting.context.add_reward=增加奖励 -bq_standard.task.is_optional=可选 \ No newline at end of file +bq_standard.task.is_optional=可选 + +betterquesting.btn.copy.tooltip.main=点击以复制任务描述 +betterquesting.btn.copy.tooltip.shift=按住SHIFT键时忽略所有格式 \ No newline at end of file diff --git a/resources/fancymenu/textures/mainmenu.button.0.png b/resources/fancymenu/textures/mainmenu.button.0.png new file mode 100644 index 0000000..115f41d Binary files /dev/null and b/resources/fancymenu/textures/mainmenu.button.0.png differ diff --git a/resources/fancymenu/textures/mainmenu.button.1.png b/resources/fancymenu/textures/mainmenu.button.1.png new file mode 100644 index 0000000..2473f5b Binary files /dev/null and b/resources/fancymenu/textures/mainmenu.button.1.png differ diff --git a/resources/fancymenu/textures/mainmenu.button.exit.0.png b/resources/fancymenu/textures/mainmenu.button.exit.0.png new file mode 100644 index 0000000..d6d2f15 Binary files /dev/null and b/resources/fancymenu/textures/mainmenu.button.exit.0.png differ diff --git a/resources/fancymenu/textures/mainmenu.button.exit.1.png b/resources/fancymenu/textures/mainmenu.button.exit.1.png new file mode 100644 index 0000000..1a3b5cf Binary files /dev/null and b/resources/fancymenu/textures/mainmenu.button.exit.1.png differ diff --git a/resources/fancymenu/textures/mainmenu.button.i18n.0.png b/resources/fancymenu/textures/mainmenu.button.i18n.0.png new file mode 100644 index 0000000..84b99cb Binary files /dev/null and b/resources/fancymenu/textures/mainmenu.button.i18n.0.png differ diff --git a/resources/fancymenu/textures/mainmenu.button.i18n.1.png b/resources/fancymenu/textures/mainmenu.button.i18n.1.png new file mode 100644 index 0000000..664a4d2 Binary files /dev/null and b/resources/fancymenu/textures/mainmenu.button.i18n.1.png differ diff --git a/resources/fancymenu/textures/mainmenu.button.link.0.png b/resources/fancymenu/textures/mainmenu.button.link.0.png new file mode 100644 index 0000000..fc977b7 Binary files /dev/null and b/resources/fancymenu/textures/mainmenu.button.link.0.png differ diff --git a/resources/fancymenu/textures/mainmenu.button.link.1.png b/resources/fancymenu/textures/mainmenu.button.link.1.png new file mode 100644 index 0000000..083dc48 Binary files /dev/null and b/resources/fancymenu/textures/mainmenu.button.link.1.png differ diff --git a/resources/fancymenu/textures/mainmenu.logo.png b/resources/fancymenu/textures/mainmenu.logo.png new file mode 100644 index 0000000..248fd5f Binary files /dev/null and b/resources/fancymenu/textures/mainmenu.logo.png differ