Remove version number in module and assets

This is nonsense since we separate versions to branches
IzzelAliz · Jun 21, 2021 · 2f60421 · 2f60421
1 parent d391e85
commit 2f60421
Show file tree

Hide file tree

Showing 40 changed files with 16 additions and 14 deletions.
diff --git a/....16/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator b/....16/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator
diff --git a/arclight-forge-1.16/.gitignore → arclight-forge/.gitignore b/arclight-forge-1.16/.gitignore → arclight-forge/.gitignore
diff --git a/arclight-forge-1.16/build.gradle → arclight-forge/build.gradle b/arclight-forge-1.16/build.gradle → arclight-forge/build.gradle
@@ -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 {

diff --git a/...va/io/izzel/arclight/server/Launcher.java → ...va/io/izzel/arclight/server/Launcher.java b/...va/io/izzel/arclight/server/Launcher.java → ...va/io/izzel/arclight/server/Launcher.java
@@ -13,6 +13,6 @@ public static void main(String[] args) throws Throwable {
             System.exit(-1);
             return;
         }
-        Main_1_16.main(args);
+        Main_Forge.main(args);
     }
 }
diff --git a/...arclight/impl/ArclightConnector_1_16.java → ...rclight/impl/ArclightConnector_Forge.java b/...arclight/impl/ArclightConnector_1_16.java → ...rclight/impl/ArclightConnector_Forge.java
@@ -5,17 +5,17 @@
 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");
     }

diff --git a/...l/arclight/impl/ArclightLocator_1_16.java → .../arclight/impl/ArclightLocator_Forge.java b/...l/arclight/impl/ArclightLocator_1_16.java → .../arclight/impl/ArclightLocator_Forge.java
@@ -7,7 +7,7 @@
 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() {

diff --git a/.../bridge/EntityBridge_ActivationRange.java → .../bridge/EntityBridge_ActivationRange.java b/.../bridge/EntityBridge_ActivationRange.java → .../bridge/EntityBridge_ActivationRange.java
diff --git a/...ommon/optimization/NoopReadWriteLock.java → ...ommon/optimization/NoopReadWriteLock.java b/...ommon/optimization/NoopReadWriteLock.java → ...ommon/optimization/NoopReadWriteLock.java
diff --git a/...optimization/OptimizedIndirectMerger.java → ...optimization/OptimizedIndirectMerger.java b/...optimization/OptimizedIndirectMerger.java → ...optimization/OptimizedIndirectMerger.java
diff --git a/...imization/dfu/CraftMagicNumbersMixin.java → ...imization/dfu/CraftMagicNumbersMixin.java b/...imization/dfu/CraftMagicNumbersMixin.java → ...imization/dfu/CraftMagicNumbersMixin.java
diff --git a/...optimization/dfu/DataFixerUpperMixin.java → ...optimization/dfu/DataFixerUpperMixin.java b/...optimization/dfu/DataFixerUpperMixin.java → ...optimization/dfu/DataFixerUpperMixin.java
diff --git a/...timization/dfu/DataFixesManagerMixin.java → ...timization/dfu/DataFixesManagerMixin.java b/...timization/dfu/DataFixesManagerMixin.java → ...timization/dfu/DataFixesManagerMixin.java
diff --git a/...mization/dfu/EntityType_BuilderMixin.java → ...mization/dfu/EntityType_BuilderMixin.java b/...mization/dfu/EntityType_BuilderMixin.java → ...mization/dfu/EntityType_BuilderMixin.java
diff --git a/...ptimization/dfu/MinecraftServerMixin.java → ...ptimization/dfu/MinecraftServerMixin.java b/...ptimization/dfu/MinecraftServerMixin.java → ...ptimization/dfu/MinecraftServerMixin.java
diff --git a/...optimization/dfu/TileEntityTypeMixin.java → ...optimization/dfu/TileEntityTypeMixin.java b/...optimization/dfu/TileEntityTypeMixin.java → ...optimization/dfu/TileEntityTypeMixin.java
diff --git a/...eneral/ClassInheritanceMultiMapMixin.java → ...eneral/ClassInheritanceMultiMapMixin.java b/...eneral/ClassInheritanceMultiMapMixin.java → ...eneral/ClassInheritanceMultiMapMixin.java
diff --git a/...eral/EntityDataManagerMixin_Optimize.java → ...eral/EntityDataManagerMixin_Optimize.java b/...eral/EntityDataManagerMixin_Optimize.java → ...eral/EntityDataManagerMixin_Optimize.java
diff --git a/...ptimization/general/VoxelShapesMixin.java → ...ptimization/general/VoxelShapesMixin.java b/...ptimization/general/VoxelShapesMixin.java → ...ptimization/general/VoxelShapesMixin.java
diff --git a/...activationrange/ActivationRangeMixin.java → ...activationrange/ActivationRangeMixin.java b/...activationrange/ActivationRangeMixin.java → ...activationrange/ActivationRangeMixin.java
diff --git a/...ionrange/EntityMixin_ActivationRange.java → ...ionrange/EntityMixin_ActivationRange.java b/...ionrange/EntityMixin_ActivationRange.java → ...ionrange/EntityMixin_ActivationRange.java
diff --git a/...nge/ServerWorldMixin_ActivationRange.java → ...nge/ServerWorldMixin_ActivationRange.java b/...nge/ServerWorldMixin_ActivationRange.java → ...nge/ServerWorldMixin_ActivationRange.java
diff --git a/...ractArrowEntityMixin_ActivationRange.java → ...ractArrowEntityMixin_ActivationRange.java b/...ractArrowEntityMixin_ActivationRange.java → ...ractArrowEntityMixin_ActivationRange.java
diff --git a/...y/AgeableEntityMixin_ActivationRange.java → ...y/AgeableEntityMixin_ActivationRange.java b/...y/AgeableEntityMixin_ActivationRange.java → ...y/AgeableEntityMixin_ActivationRange.java
diff --git a/...fectCloudEntityMixin_ActivationRange.java → ...fectCloudEntityMixin_ActivationRange.java b/...fectCloudEntityMixin_ActivationRange.java → ...fectCloudEntityMixin_ActivationRange.java
diff --git a/...orkRocketEntityMixin_ActivationRange.java → ...orkRocketEntityMixin_ActivationRange.java b/...orkRocketEntityMixin_ActivationRange.java → ...orkRocketEntityMixin_ActivationRange.java
diff --git a/...tity/ItemEntityMixin_ActivationRange.java → ...tity/ItemEntityMixin_ActivationRange.java b/...tity/ItemEntityMixin_ActivationRange.java → ...tity/ItemEntityMixin_ActivationRange.java
diff --git a/...ty/LivingEntityMixin_ActivationRange.java → ...ty/LivingEntityMixin_ActivationRange.java b/...ty/LivingEntityMixin_ActivationRange.java → ...ty/LivingEntityMixin_ActivationRange.java
diff --git a/.../VillagerEntityMixin_ActivationRange.java → .../VillagerEntityMixin_ActivationRange.java b/.../VillagerEntityMixin_ActivationRange.java → .../VillagerEntityMixin_ActivationRange.java
diff --git a/...ange/ChunkManagerMixin_TrackingRange.java → ...ange/ChunkManagerMixin_TrackingRange.java b/...ange/ChunkManagerMixin_TrackingRange.java → ...ange/ChunkManagerMixin_TrackingRange.java
diff --git a/...stream/CommandNodeMixin_Optimization.java → ...stream/CommandNodeMixin_Optimization.java b/...stream/CommandNodeMixin_Optimization.java → ...stream/CommandNodeMixin_Optimization.java
diff --git a/...ptimization/stream/GoalSelectorMixin.java → ...ptimization/stream/GoalSelectorMixin.java b/...ptimization/stream/GoalSelectorMixin.java → ...ptimization/stream/GoalSelectorMixin.java
diff --git a/...tion/stream/ITaskQueue_PriorityMixin.java → ...tion/stream/ITaskQueue_PriorityMixin.java b/...tion/stream/ITaskQueue_PriorityMixin.java → ...tion/stream/ITaskQueue_PriorityMixin.java
diff --git a/...a/io/izzel/arclight/server/Main_1_16.java → .../io/izzel/arclight/server/Main_Forge.java b/...a/io/izzel/arclight/server/Main_1_16.java → .../io/izzel/arclight/server/Main_Forge.java
@@ -4,7 +4,7 @@
 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() {

diff --git a/....16/src/main/resources/META-INF/mods.toml → ...rge/src/main/resources/META-INF/mods.toml b/....16/src/main/resources/META-INF/mods.toml → ...rge/src/main/resources/META-INF/mods.toml
diff --git a/...rge/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator b/...rge/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator
@@ -0,0 +1 @@
+io.izzel.arclight.impl.ArclightLocator_Forge
diff --git a/....arclight.impl.optimization.dfu.1_16.json → ...arclight.impl.forge.optimization.dfu.json b/....arclight.impl.optimization.dfu.1_16.json → ...arclight.impl.forge.optimization.dfu.json
@@ -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",

diff --git a/...xins.arclight.impl.optimization.1_16.json → ...ins.arclight.impl.forge.optimization.json b/...xins.arclight.impl.optimization.1_16.json → ...ins.arclight.impl.forge.optimization.json
@@ -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",

diff --git a/...clight.impl.optimization.stream.1_16.json → ...light.impl.forge.optimization.stream.json b/...clight.impl.optimization.stream.1_16.json → ...light.impl.forge.optimization.stream.json
@@ -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",

diff --git a/...forge-1.16/src/main/resources/pack.mcmeta → ...ight-forge/src/main/resources/pack.mcmeta b/...forge-1.16/src/main/resources/pack.mcmeta → ...ight-forge/src/main/resources/pack.mcmeta
diff --git a/settings.gradle b/settings.gradle
@@ -1,6 +1,6 @@
 rootProject.name = 'arclight'
 include 'arclight-common'
 include 'forge-installer'
-include 'arclight-forge-1.16'
+include 'arclight-forge'
 include 'i18n-config'