forked from IrisShaders/Iris
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'trunk' into trunk-new-sodium-screen
- Loading branch information
Showing
38 changed files
with
667 additions
and
108 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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
33 changes: 33 additions & 0 deletions
33
src/headers/java/com/terraformersmc/modmenu/api/ConfigScreenFactory.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,33 @@ | ||
| /* | ||
| * MIT License | ||
| * | ||
| * Copyright (c) 2018-2020 Prospector | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package com.terraformersmc.modmenu.api; | ||
|
|
||
| import net.minecraft.client.gui.screen.Screen; | ||
|
|
||
| @FunctionalInterface | ||
| @SuppressWarnings("deprecation") | ||
| public interface ConfigScreenFactory<S extends Screen> extends io.github.prospector.modmenu.api.ConfigScreenFactory<S> { | ||
| S create(Screen parent); | ||
| } |
81 changes: 81 additions & 0 deletions
81
src/headers/java/com/terraformersmc/modmenu/api/ModMenuApi.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,81 @@ | ||
| /* | ||
| * MIT License | ||
| * | ||
| * Copyright (c) 2018-2020 Prospector | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package com.terraformersmc.modmenu.api; | ||
|
|
||
| import com.terraformersmc.modmenu.util.ModMenuApiMarker; | ||
| import net.minecraft.client.gui.screen.Screen; | ||
| import net.minecraft.text.Text; | ||
|
|
||
| import java.util.Map; | ||
|
|
||
| public interface ModMenuApi extends ModMenuApiMarker { | ||
| /** | ||
| * Used for creating a {@link Screen} instance of the Mod Menu | ||
| * "Mods" screen | ||
| * | ||
| * @param previous The screen before opening | ||
| * @return A "Mods" Screen | ||
| */ | ||
| static Screen createModsScreen(Screen previous) { | ||
| throw new AssertionError("Attempt to call API header stub method"); | ||
| } | ||
|
|
||
| /** | ||
| * Used for creating a {@link Text} just like what would appear | ||
| * on a Mod Menu Mods button | ||
| * | ||
| * @return The text that would be displayed on a Mods button | ||
| */ | ||
| static Text createModsButtonText() { | ||
| throw new AssertionError("Attempt to call API header stub method"); | ||
| } | ||
|
|
||
| /** | ||
| * Used to construct a new config screen instance when your mod's | ||
| * configuration button is selected on the mod menu screen. The | ||
| * screen instance parameter is the active mod menu screen. | ||
| * | ||
| * @return A factory for constructing config screen instances. | ||
| */ | ||
| default ConfigScreenFactory<?> getModConfigScreenFactory() { | ||
| throw new AssertionError("Attempt to call API header stub method"); | ||
| } | ||
|
|
||
| /** | ||
| * Used to provide config screen factories for other mods. This takes second | ||
| * priority to a mod's own config screen factory provider. For example, if | ||
| * mod `xyz` supplies a config screen factory, mod `abc` providing a config | ||
| * screen to `xyz` will be pointless, as the one provided by `xyz` will be | ||
| * used. | ||
| * <p> | ||
| * This method is NOT meant to be used to add a config screen factory to | ||
| * your own mod. | ||
| * | ||
| * @return a map of mod ids to screen factories. | ||
| */ | ||
| default Map<String, ConfigScreenFactory<?>> getProvidedConfigScreenFactories() { | ||
| throw new AssertionError("Attempt to call API header stub method"); | ||
| } | ||
| } |
28 changes: 28 additions & 0 deletions
28
src/headers/java/com/terraformersmc/modmenu/util/ModMenuApiMarker.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,28 @@ | ||
| /* | ||
| * MIT License | ||
| * | ||
| * Copyright (c) 2018-2020 Prospector | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package com.terraformersmc.modmenu.util; | ||
|
|
||
| public interface ModMenuApiMarker { | ||
| } |
38 changes: 38 additions & 0 deletions
38
src/headers/java/io/github/prospector/modmenu/api/ConfigScreenFactory.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,38 @@ | ||
| /* | ||
| * MIT License | ||
| * | ||
| * Copyright (c) 2018-2020 Prospector | ||
| * | ||
| * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| * of this software and associated documentation files (the "Software"), to deal | ||
| * in the Software without restriction, including without limitation the rights | ||
| * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| * copies of the Software, and to permit persons to whom the Software is | ||
| * furnished to do so, subject to the following conditions: | ||
| * | ||
| * The above copyright notice and this permission notice shall be included in all | ||
| * copies or substantial portions of the Software. | ||
| * | ||
| * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| * SOFTWARE. | ||
| */ | ||
|
|
||
| package io.github.prospector.modmenu.api; | ||
|
|
||
| import net.minecraft.client.gui.screen.Screen; | ||
|
|
||
| /** | ||
| * Deprecated interface, switch to {@link com.terraformersmc.modmenu.api.ModMenuApi} and {@link com.terraformersmc.modmenu.api.ConfigScreenFactory} instead | ||
| * | ||
| * Will be removed in 1.18 snapshots | ||
| */ | ||
| @Deprecated | ||
| @FunctionalInterface | ||
| public interface ConfigScreenFactory<S extends Screen> { | ||
| S create(Screen parent); | ||
| } |
Oops, something went wrong.