-
-
Notifications
You must be signed in to change notification settings - Fork 49
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/main' into 1.20.2-recode
- Loading branch information
Showing
10 changed files
with
129 additions
and
32 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
73 changes: 73 additions & 0 deletions
73
src/main/java/de/florianmichael/viafabricplus/injection/MixinPlugin.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,73 @@ | ||
| /* | ||
| * This file is part of ViaFabricPlus - https://github.com/FlorianMichael/ViaFabricPlus | ||
| * Copyright (C) 2021-2023 FlorianMichael/EnZaXD and contributors | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation, either version 3 of the License, 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 General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| */ | ||
| package de.florianmichael.viafabricplus.injection; | ||
|
|
||
| import net.fabricmc.loader.api.FabricLoader; | ||
| import org.objectweb.asm.tree.ClassNode; | ||
| import org.spongepowered.asm.mixin.extensibility.IMixinConfigPlugin; | ||
| import org.spongepowered.asm.mixin.extensibility.IMixinInfo; | ||
|
|
||
| import java.util.List; | ||
| import java.util.Set; | ||
|
|
||
| public class MixinPlugin implements IMixinConfigPlugin { | ||
| public final static String INJECTOR_PACKAGE = "de.florianmichael.viafabricplus.injection.mixin"; | ||
| private final static String MC_FIXES_PACKAGE = ".fixes.minecraft"; | ||
|
|
||
| public static boolean DASH_LOADER_PRESENT; | ||
| public static boolean ARMOR_SKIN_PRESENT; | ||
|
|
||
| @Override | ||
| public void onLoad(String mixinPackage) { | ||
| final var loader = FabricLoader.getInstance(); | ||
|
|
||
| DASH_LOADER_PRESENT = loader.isModLoaded("dashloader"); | ||
| ARMOR_SKIN_PRESENT = loader.isModLoaded("armorskin"); | ||
| } | ||
|
|
||
| @Override | ||
| public String getRefMapperConfig() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean shouldApplyMixin(String targetClassName, String mixinClassName) { | ||
| if (mixinClassName.equals(INJECTOR_PACKAGE + MC_FIXES_PACKAGE + ".MixinFontStorage")) { | ||
| return !DASH_LOADER_PRESENT; | ||
| } | ||
| if (mixinClassName.equals(INJECTOR_PACKAGE + MC_FIXES_PACKAGE + ".MixinInGameHud")) { | ||
| return !ARMOR_SKIN_PRESENT; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {} | ||
|
|
||
| @Override | ||
| public List<String> getMixins() { | ||
| return null; | ||
| } | ||
|
|
||
| @Override | ||
| public void preApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {} | ||
|
|
||
| @Override | ||
| public void postApply(String targetClassName, ClassNode targetClass, String mixinClassName, IMixinInfo mixinInfo) {} | ||
| } |
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,6 +44,7 @@ | |
| "krypton": "<=0.2.2" | ||
| }, | ||
| "conflicts": { | ||
| "dashloader": "*" | ||
| "dashloader": "*", | ||
| "armorskin": "*" | ||
| } | ||
| } | ||
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