Remove version number in module and assets

This is nonsense since we separate versions to branches
This commit is contained in:
IzzelAliz 2021-06-21 11:54:14 +08:00
parent d391e85c98
commit 2f60421f2c
40 changed files with 16 additions and 14 deletions

View File

@ -1 +0,0 @@
io.izzel.arclight.impl.ArclightLocator_1_16

View File

@ -29,6 +29,8 @@ arclight {
packageName = 'spigot'
}
archivesBaseName = archivesBaseName + '-' + minecraftVersion
sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
sourceSets {
@ -119,7 +121,7 @@ processResources {
}
jar {
manifest.attributes 'MixinConnector': 'io.izzel.arclight.impl.ArclightConnector_1_16'
manifest.attributes 'MixinConnector': 'io.izzel.arclight.impl.ArclightConnector_Forge'
manifest.attributes 'Main-Class': 'io.izzel.arclight.server.Launcher'
manifest.attributes 'Implementation-Title': 'Arclight'
manifest.attributes 'Implementation-Version': "arclight-$minecraftVersion-${project.version}-${getGitHash()}"
@ -150,7 +152,7 @@ processMapping {
}
mixin {
add sourceSets.main, 'mixins.arclight.impl.refmap.1_16.json'
add sourceSets.main, 'mixins.arclight.impl.forge.refmap.json'
}
compileJava {

View File

@ -13,6 +13,6 @@ public class Launcher {
System.exit(-1);
return;
}
Main_1_16.main(args);
Main_Forge.main(args);
}
}

View File

@ -5,17 +5,17 @@ import io.izzel.arclight.i18n.ArclightConfig;
import org.spongepowered.asm.mixin.Mixins;
@SuppressWarnings("unused")
public class ArclightConnector_1_16 extends ArclightConnector {
public class ArclightConnector_Forge extends ArclightConnector {
@Override
public void connect() {
super.connect();
Mixins.addConfiguration("mixins.arclight.impl.optimization.1_16.json");
Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.json");
if (ArclightConfig.spec().getOptimization().isRemoveStream()) {
Mixins.addConfiguration("mixins.arclight.impl.optimization.stream.1_16.json");
Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.stream.json");
}
if (ArclightConfig.spec().getOptimization().isDisableDFU()) {
Mixins.addConfiguration("mixins.arclight.impl.optimization.dfu.1_16.json");
Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.dfu.json");
}
LOGGER.info("mixin-load.optimization");
}

View File

@ -7,7 +7,7 @@ import net.minecraftforge.forgespi.locating.IModFile;
import java.io.File;
import java.net.URISyntaxException;
public class ArclightLocator_1_16 extends ArclightLocator {
public class ArclightLocator_Forge extends ArclightLocator {
@Override
protected IModFile loadJars() {

View File

@ -4,7 +4,7 @@ import io.izzel.arclight.api.ArclightVersion;
import io.izzel.arclight.common.ArclightMain;
import io.izzel.arclight.forgeinstaller.ForgeInstaller;
public class Main_1_16 {
public class Main_Forge {
public static void main(String[] args) throws Throwable {
new ArclightMain() {

View File

@ -0,0 +1 @@
io.izzel.arclight.impl.ArclightLocator_Forge

View File

@ -2,7 +2,7 @@
"minVersion": "0.8",
"package": "io.izzel.arclight.impl.mixin.optimization.dfu",
"target": "@env(DEFAULT)",
"refmap": "mixins.arclight.impl.refmap.1_16.json",
"refmap": "mixins.arclight.impl.forge.refmap.json",
"mixins": [
"CraftMagicNumbersMixin",
"DataFixerUpperMixin",

View File

@ -2,7 +2,7 @@
"minVersion": "0.8",
"package": "io.izzel.arclight.impl.mixin.optimization.general",
"target": "@env(DEFAULT)",
"refmap": "mixins.arclight.impl.refmap.1_16.json",
"refmap": "mixins.arclight.impl.forge.refmap.json",
"mixins": [
"ClassInheritanceMultiMapMixin",
"EntityDataManagerMixin_Optimize",

View File

@ -2,7 +2,7 @@
"minVersion": "0.8",
"package": "io.izzel.arclight.impl.mixin.optimization.stream",
"target": "@env(DEFAULT)",
"refmap": "mixins.arclight.impl.refmap.1_16.json",
"refmap": "mixins.arclight.impl.forge.refmap.json",
"mixins": [
"CommandNodeMixin_Optimization",
"GoalSelectorMixin",

View File

@ -1,6 +1,6 @@
rootProject.name = 'arclight'
include 'arclight-common'
include 'forge-installer'
include 'arclight-forge-1.16'
include 'arclight-forge'
include 'i18n-config'