-
-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
# Conflicts: # default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/DefaultSmithingDisplay.java # fabric/src/main/resources/roughlyenoughitems.accessWidener # forge/src/main/resources/META-INF/accesstransformer.cfg
- Loading branch information
Showing
27 changed files
with
1,116 additions
and
236 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
48 changes: 48 additions & 0 deletions
48
api/src/main/java/me/shedaniel/rei/impl/common/plugins/PluginReloadContext.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,48 @@ | ||
| /* | ||
| * This file is licensed under the MIT License, part of Roughly Enough Items. | ||
| * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel | ||
| * | ||
| * 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 me.shedaniel.rei.impl.common.plugins; | ||
|
|
||
| import me.shedaniel.rei.api.common.registry.ReloadStage; | ||
| import org.jetbrains.annotations.ApiStatus; | ||
|
|
||
| @ApiStatus.Internal | ||
| public interface PluginReloadContext { | ||
| ReloadStage stage(); | ||
|
|
||
| ReloadInterruptionContext interruptionContext(); | ||
|
|
||
| static PluginReloadContext of(ReloadStage stage, ReloadInterruptionContext interruptionContext) { | ||
| return new PluginReloadContext() { | ||
| @Override | ||
| public ReloadStage stage() { | ||
| return stage; | ||
| } | ||
|
|
||
| @Override | ||
| public ReloadInterruptionContext interruptionContext() { | ||
| return interruptionContext; | ||
| } | ||
| }; | ||
| } | ||
| } |
63 changes: 63 additions & 0 deletions
63
api/src/main/java/me/shedaniel/rei/impl/common/plugins/ReloadInterruptionContext.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,63 @@ | ||
| /* | ||
| * This file is licensed under the MIT License, part of Roughly Enough Items. | ||
| * Copyright (c) 2018, 2019, 2020, 2021, 2022, 2023 shedaniel | ||
| * | ||
| * 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 me.shedaniel.rei.impl.common.plugins; | ||
|
|
||
| import me.shedaniel.rei.impl.common.InternalLogger; | ||
| import org.jetbrains.annotations.ApiStatus; | ||
|
|
||
| @FunctionalInterface | ||
| @ApiStatus.Internal | ||
| public interface ReloadInterruptionContext { | ||
| boolean isInterrupted(); | ||
|
|
||
| default void checkInterrupted() throws InterruptedException { | ||
| if (isInterrupted()) { | ||
| InternalLogger.getInstance().debug("Plugin reload interrupted!"); | ||
| throw new InterruptedException(); | ||
| } | ||
| } | ||
|
|
||
| default ReloadInterruptionContext withJob(Runnable ifInterrupted) { | ||
| return new ReloadInterruptionContext() { | ||
| @Override | ||
| public boolean isInterrupted() { | ||
| return ReloadInterruptionContext.this.isInterrupted(); | ||
| } | ||
|
|
||
| @Override | ||
| public void checkInterrupted() throws InterruptedException { | ||
| try { | ||
| ReloadInterruptionContext.this.checkInterrupted(); | ||
| } catch (InterruptedException e) { | ||
| ifInterrupted.run(); | ||
| throw e; | ||
| } | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| static ReloadInterruptionContext ofNever() { | ||
| return () -> false; | ||
| } | ||
| } |
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
Oops, something went wrong.