-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'v1' into isolated-lwjgl3
- Loading branch information
Showing
13 changed files
with
410 additions
and
92 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
File renamed without changes.
File renamed without changes.
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
19 changes: 0 additions & 19 deletions
19
modules/ui/src/main/kotlin/org/polyfrost/oneconfig/api/ui/v1/internal/StbImpl.kt
This file was deleted.
Oops, something went wrong.
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
74 changes: 74 additions & 0 deletions
74
.../1.16.5-forge/src/main/java/org/polyfrost/oneconfig/api/ui/v1/internal/UIManagerImpl.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,74 @@ | ||
| /* | ||
| * This file is part of OneConfig. | ||
| * OneConfig - Next Generation Config Library for Minecraft: Java Edition | ||
| * Copyright (C) 2021~2024 Polyfrost. | ||
| * <https://polyfrost.org> <https://github.com/Polyfrost/> | ||
| * | ||
| * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. | ||
| * | ||
| * OneConfig is licensed under the terms of version 3 of the GNU Lesser | ||
| * General Public License as published by the Free Software Foundation, AND | ||
| * under the Additional Terms Applicable to OneConfig, as published by Polyfrost, | ||
| * either version 1.0 of the Additional Terms, or (at your option) any later | ||
| * version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License. If not, see <https://www.gnu.org/licenses/>. You should | ||
| * have also received a copy of the Additional Terms Applicable | ||
| * to OneConfig, as published by Polyfrost. If not, see | ||
| * <https://polyfrost.org/legal/oneconfig/additional-terms> | ||
| */ | ||
|
|
||
| package org.polyfrost.oneconfig.api.ui.v1.internal; | ||
|
|
||
| import net.minecraft.client.Minecraft; | ||
| import org.jetbrains.annotations.NotNull; | ||
| import org.polyfrost.oneconfig.api.ui.v1.TinyFD; | ||
| import org.polyfrost.oneconfig.api.ui.v1.UIManager; | ||
| import org.polyfrost.oneconfig.api.ui.v1.internal.wrappers.MCWindow; | ||
| import org.polyfrost.oneconfig.api.ui.v1.internal.wrappers.PolyUIScreen; | ||
| import org.polyfrost.polyui.PolyUI; | ||
| import org.polyfrost.polyui.renderer.Renderer; | ||
| import org.polyfrost.polyui.renderer.Window; | ||
|
|
||
| import java.util.function.Consumer; | ||
|
|
||
| public class UIManagerImpl implements UIManager { | ||
| private static final TinyFD impl = new TinyFDImpl(); | ||
| //#if MC>=11700 | ||
| //$$ static { | ||
| //$$ RendererImpl.INSTANCE.setGl3(true); | ||
| //$$ } | ||
| //#endif | ||
| private PolyUI ui; | ||
|
|
||
| @Override | ||
| public Renderer getRenderer() { | ||
| return RendererImpl.INSTANCE; | ||
| } | ||
|
|
||
| @Override | ||
| public TinyFD getTinyFD() { | ||
| return impl; | ||
| } | ||
|
|
||
| @Override | ||
| public Object createPolyUIScreen(@NotNull PolyUI polyUI, float desiredScreenWidth, float desiredScreenHeight, boolean pauses, boolean blurs, Consumer<PolyUI> onClose) { | ||
| return new PolyUIScreen(polyUI, desiredScreenWidth, desiredScreenHeight, pauses, blurs, onClose); | ||
| } | ||
|
|
||
| @Override | ||
| public Window createWindow() { | ||
| return new MCWindow(Minecraft.getInstance()); | ||
| } | ||
|
|
||
| @Override | ||
| public @NotNull PolyUI getDefaultInstance() { | ||
| return ui == null ? ui = createDefault() : ui; | ||
| } | ||
| } |
Oops, something went wrong.