Upstream/ViaForge
1
0
Fork 0
mirror of https://github.com/ViaVersion/ViaForge.git synced 2024-11-27 12:55:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

3.6.0: Fix jar output

Browse Source
This commit is contained in:
FlorianMichael 2024-05-01 08:17:12 +02:00
parent 856db36d81
commit 47b3f2f06b
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -90,12 +90,12 @@ processResources {
} }
mixin { mixin {
add sourceSets.main, "mixins.${maven_name}-mc18.refmap.json" add sourceSets.main, "mixins.${maven_name}.refmap.json"
} }
jar { jar {
manifest.attributes( manifest.attributes(
"MixinConfigs": "mixins.${maven_name}-mc18.json", "MixinConfigs": "mixins.${maven_name}.json",
"tweakClass": "org.spongepowered.asm.launch.MixinTweaker", "tweakClass": "org.spongepowered.asm.launch.MixinTweaker",
"TweakOrder": 0, "TweakOrder": 0,
"FMLCorePluginContainsFMLMod": "de.florianmichael.viaforge.mixin.MixinLoader" "FMLCorePluginContainsFMLMod": "de.florianmichael.viaforge.mixin.MixinLoader"

4
src/main/java/de/florianmichael/viaforge/ViaForge18.java → src/main/java/de/florianmichael/viaforge/ViaForge189.java
View File

@ -30,9 +30,9 @@ import java.io.File;
import java.util.function.Supplier; import java.util.function.Supplier;
@Mod(modid = "viaforge") @Mod(modid = "viaforge")
public class ViaForge18 implements VFPlatform { public class ViaForge189 implements VFPlatform {
public static final ViaForge18 PLATFORM = new ViaForge18(); public static final ViaForge189 PLATFORM = new ViaForge189();
@Override @Override
public int getGameVersion() { public int getGameVersion() {

2
src/main/java/de/florianmichael/viaforge/mixin/MixinLoader.java
View File

@ -29,7 +29,7 @@ public class MixinLoader implements IFMLLoadingPlugin {
public MixinLoader() { public MixinLoader() {
MixinBootstrap.init(); MixinBootstrap.init();
Mixins.addConfiguration("mixins.viaforge-mc18.json"); Mixins.addConfiguration("mixins.viaforge-mc189.json");
MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT); MixinEnvironment.getDefaultEnvironment().setSide(MixinEnvironment.Side.CLIENT);
} }

4
src/main/java/de/florianmichael/viaforge/mixin/impl/MixinGuiMainMenu.java
View File

@ -19,7 +19,7 @@
package de.florianmichael.viaforge.mixin.impl; package de.florianmichael.viaforge.mixin.impl;
import com.viaversion.viaversion.util.Pair; import com.viaversion.viaversion.util.Pair;
import de.florianmichael.viaforge.ViaForge18; import de.florianmichael.viaforge.ViaForge189;
import de.florianmichael.viaforge.common.ViaForgeCommon; import de.florianmichael.viaforge.common.ViaForgeCommon;
import de.florianmichael.viaforge.common.platform.ViaForgeConfig; import de.florianmichael.viaforge.common.platform.ViaForgeConfig;
import de.florianmichael.viaforge.gui.GuiProtocolSelector; import de.florianmichael.viaforge.gui.GuiProtocolSelector;
@ -34,7 +34,7 @@ public class MixinGuiMainMenu extends GuiScreen {
@Inject(method = "initGui", at = @At("RETURN")) @Inject(method = "initGui", at = @At("RETURN"))
public void hookViaForgeButton(CallbackInfo ci) { public void hookViaForgeButton(CallbackInfo ci) {
ViaForgeCommon.init(ViaForge18.PLATFORM); ViaForgeCommon.init(ViaForge189.PLATFORM);
final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig(); final ViaForgeConfig config = ViaForgeCommon.getManager().getConfig();
if (config.isShowMainMenuButton()) { if (config.isShowMainMenuButton()) {

2
src/main/resources/mixins.viaforge-mc18.json → src/main/resources/mixins.viaforge-mc189.json
View File

@ -3,7 +3,7 @@
"minVersion": "0.7.5", "minVersion": "0.7.5",
"compatibilityLevel": "JAVA_8", "compatibilityLevel": "JAVA_8",
"package": "de.florianmichael.viaforge.mixin.impl", "package": "de.florianmichael.viaforge.mixin.impl",
"refmap": "mixins.viaforge-mc18.refmap.json", "refmap": "mixins.viaforge-mc189.refmap.json",
"client": [ "client": [
"MixinGuiMainMenu", "MixinGuiMainMenu",
"MixinGuiMultiplayer", "MixinGuiMultiplayer",