-
-
Notifications
You must be signed in to change notification settings - Fork 88
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'QuiltMC:develop' into heipiao233-patch-chinese
- Loading branch information
Showing
113 changed files
with
5,932 additions
and
2,570 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletions
3
...ecraft-test/src/main/java/net/fabricmc/minecraft/test/server_only/TestMixinGuiHelper.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 2 additions & 1 deletion
3
...ft/minecraft-test/src/main/java/net/fabricmc/minecraft/test/server_only/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| // @org.quiltmc.loader.api.minecraft.DedicatedServerOnly | ||
| //@org.quiltmc.loader.api.minecraft.DedicatedServerOnly | ||
| //@org.quiltmc.loader.api.Requires({"trinkets", "quilt_loader", "minecraft", "buildcraft"}) | ||
| // Uncomment the above line to test out package based stripping. | ||
| package net.fabricmc.minecraft.test.server_only; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
src/fabric/impl/java/net/fabricmc/loader/impl/gui/FabricGuiEntry.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| /* | ||
| * Copyright 2016 FabricMC | ||
| * Copyright 2022-2023 QuiltMC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package net.fabricmc.loader.impl.gui; | ||
|
|
||
| import java.awt.GraphicsEnvironment; | ||
| import java.util.function.Consumer; | ||
|
|
||
| import org.quiltmc.loader.api.gui.LoaderGuiException; | ||
| import org.quiltmc.loader.api.gui.QuiltLoaderGui; | ||
| import org.quiltmc.loader.api.gui.QuiltLoaderText; | ||
| import org.quiltmc.loader.impl.QuiltLoaderImpl; | ||
| import org.quiltmc.loader.impl.game.GameProvider; | ||
| import org.quiltmc.loader.impl.gui.QuiltGuiEntry; | ||
| import org.quiltmc.loader.impl.util.log.Log; | ||
| import org.quiltmc.loader.impl.util.log.LogCategory; | ||
|
|
||
| import net.fabricmc.loader.impl.gui.FabricStatusTree.FabricBasicButtonType; | ||
| import net.fabricmc.loader.impl.gui.FabricStatusTree.FabricStatusTab; | ||
|
|
||
| /** @deprecated Replaced by the public APIs in {@link QuiltLoaderGui} */ | ||
| @Deprecated | ||
| public class FabricGuiEntry { | ||
|
|
||
| /** Opens the given {@link FabricStatusTree} in a new swing window. | ||
| * | ||
| * @throws Exception if something went wrong while opening the window. */ | ||
| public static void open(FabricStatusTree tree) throws Exception { | ||
| QuiltLoaderGui.open(tree.toQuiltWindow()); | ||
| } | ||
|
|
||
| /** @param exitAfter If true then this will call {@link System#exit(int)} after showing the gui, otherwise this will | ||
| * return normally. */ | ||
| public static void displayCriticalError(Throwable exception, boolean exitAfter) { | ||
| displayError(QuiltLoaderText.translate("").toString(), exception, exitAfter); | ||
| } | ||
|
|
||
| public static void displayError(String mainText, Throwable exception, boolean exitAfter) { | ||
| QuiltGuiEntry.displayError(mainText, exception, true, exitAfter); | ||
| } | ||
|
|
||
| public static void displayError(String mainText, Throwable exception, Consumer<FabricStatusTree> treeCustomiser, boolean exitAfter) { | ||
| GameProvider provider = QuiltLoaderImpl.INSTANCE.tryGetGameProvider(); | ||
|
|
||
| if ((provider == null || provider.canOpenGui()) && !GraphicsEnvironment.isHeadless()) { | ||
| FabricStatusTree tree = new FabricStatusTree("Quilt Loader " + QuiltLoaderImpl.VERSION, mainText); | ||
| FabricStatusTab crashTab = tree.addTab(QuiltLoaderText.translate("tab.messages").toString()); | ||
|
|
||
| if (exception == null) { | ||
| exception = new Error("Missing exception!"); | ||
| } | ||
| crashTab.node.addCleanedException(exception); | ||
|
|
||
| tree.addButton(QuiltLoaderText.translate("button.exit").toString(), FabricBasicButtonType.CLICK_ONCE).makeClose(); | ||
| treeCustomiser.accept(tree); | ||
| try { | ||
| QuiltLoaderGui.open(tree.toQuiltWindow()); | ||
| } catch (LoaderGuiException e) { | ||
| if (exitAfter) { | ||
| Log.warn(LogCategory.GENERAL, "Failed to open the error gui!", e); | ||
| } else { | ||
| throw new RuntimeException("Failed to open the error gui!", e); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (exitAfter) { | ||
| System.exit(1); | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.