Cleanup build files

ViaVersion · Dec 24, 2024 · 90c1832 · 90c1832
1 parent 10bcd40
commit 90c1832
Show file tree

Hide file tree

Showing 12 changed files with 34 additions and 37 deletions.
diff --git a/api-legacy/build.gradle b/api-legacy/build.gradle
@@ -5,6 +5,6 @@ plugins {
 dependencies {
     compileOnly project(":viafabricplus-api")
 
-    // They don't matter and are only used to compile against
-    compileOnly "com.viaversion:viaversion-common:5.2.1-SNAPSHOT"
+    compileOnly "com.viaversion:viaversion-common:${project.viaversion_version}"
+    compileOnly "net.raphimc:ViaLoader:${project.vialoader_version}"
 }
diff --git a/api/build.gradle b/api/build.gradle
@@ -3,10 +3,6 @@ plugins {
 }
 
 dependencies {
-    // They don't matter and are only used to compile against
-    compileOnly "com.viaversion:viaversion-common:5.2.1-SNAPSHOT"
-    compileOnly ("net.raphimc:ViaLoader:3.0.4") {
-        exclude group: "com.google.guava", module: "guava"
-        exclude group: "org.slf4j", module: "slf4j-api"
-    }
+    compileOnly "com.viaversion:viaversion-common:${project.viaversion_version}"
+    compileOnly "net.raphimc:ViaLoader:${project.vialoader_version}"
 }
diff --git a/build.gradle b/build.gradle
@@ -35,15 +35,15 @@ dependencies {
 	// Will be removed in future versions
 	include implementation(project(":viafabricplus-api-legacy"))
 
-	jij "com.viaversion:viaversion-common:5.2.1-SNAPSHOT"
-	jij "com.viaversion:viabackwards-common:5.2.1-SNAPSHOT"
-	jij "net.raphimc:viaaprilfools-common:3.0.4"
-	jij "net.raphimc:ViaLegacy:3.0.7-SNAPSHOT"
-	jij ("net.raphimc:ViaBedrock:0.0.14-SNAPSHOT") {
+	jij "com.viaversion:viaversion-common:${project.viaversion_version}"
+	jij "com.viaversion:viabackwards-common:${project.viabackwards_version}"
+	jij "net.raphimc:viaaprilfools-common:${project.viaaprilfools_version}"
+	jij "net.raphimc:ViaLegacy:${project.vialegacy_version}"
+	jij ("net.raphimc:ViaBedrock:${project.viabedrock_version}") {
 		exclude group: "io.jsonwebtoken"
 		exclude group: "com.mojang", module: "brigadier"
 	}
-	jij ("net.raphimc:ViaLoader:3.0.4") {
+	jij ("net.raphimc:ViaLoader:${project.vialoader_version}") {
 		exclude group: "com.google.guava", module: "guava"
 		exclude group: "org.slf4j", module: "slf4j-api"
 	}

diff --git a/gradle.properties b/gradle.properties
@@ -13,5 +13,13 @@ yarn_version=1.21.4+build.2
 loader_version=0.16.9
 fabric_api_version=0.112.0+1.21.4
 
+# Via, keeping it here to re-use accross projects without requiring to recompile build scripts
+viaversion_version=5.2.1-SNAPSHOT
+viabackwards_version=5.2.1-SNAPSHOT
+viaaprilfools_version=3.0.4
+vialegacy_version=3.0.7-SNAPSHOT
+viabedrock_version=0.0.14-SNAPSHOT
+vialoader_version=3.0.4
+
 # Set to empty to use the Minecraft version above
 supported_versions=
diff --git a/...craft/entity/MixinClientPlayerEntity.java → ...ement/entity/MixinClientPlayerEntity.java b/...craft/entity/MixinClientPlayerEntity.java → ...ement/entity/MixinClientPlayerEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.old.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.entity;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
@@ -29,7 +29,6 @@
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viafabricplus.injection.access.base.IClientConnection;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
-import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.input.Input;
 import net.minecraft.client.network.AbstractClientPlayerEntity;

diff --git a/...xin/old/minecraft/entity/MixinEntity.java → ...features/movement/entity/MixinEntity.java b/...xin/old/minecraft/entity/MixinEntity.java → ...features/movement/entity/MixinEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.old.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.features.entity.riding_offsets.EntityRidingOffsetsPre1_20_2;

diff --git a/...d/minecraft/entity/MixinLivingEntity.java → ...es/movement/entity/MixinLivingEntity.java b/...d/minecraft/entity/MixinLivingEntity.java → ...es/movement/entity/MixinLivingEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.old.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.entity;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;

diff --git a/...d/minecraft/entity/MixinPlayerEntity.java → ...es/movement/entity/MixinPlayerEntity.java b/...d/minecraft/entity/MixinPlayerEntity.java → ...es/movement/entity/MixinPlayerEntity.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.old.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.entity;
 
 import com.llamalad7.mixinextras.injector.v2.WrapWithCondition;
 import com.llamalad7.mixinextras.sugar.Local;
@@ -37,9 +37,7 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.registry.entry.RegistryEntry;
-import net.minecraft.sound.SoundEvent;
 import net.minecraft.util.Hand;
-import net.minecraft.util.Identifier;
 import net.minecraft.world.World;
 import net.raphimc.vialegacy.api.LegacyProtocolVersion;
 import org.spongepowered.asm.mixin.Final;

diff --git a/...aft/entity/MixinPlayerEntityRenderer.java → ...ent/entity/MixinPlayerEntityRenderer.java b/...aft/entity/MixinPlayerEntityRenderer.java → ...ent/entity/MixinPlayerEntityRenderer.java
@@ -19,7 +19,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.old.minecraft.entity;
+package com.viaversion.viafabricplus.injection.mixin.features.movement.entity;
 
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;

diff --git a/...n/old/minecraft/MixinMinecraftClient.java → ...nventory_packet/MixinMinecraftClient.java b/...n/old/minecraft/MixinMinecraftClient.java → ...nventory_packet/MixinMinecraftClient.java
@@ -19,15 +19,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.viaversion.viafabricplus.injection.mixin.old.minecraft;
+package com.viaversion.viafabricplus.injection.mixin.features.open_inventory_packet;
 
 import com.viaversion.viaversion.api.protocol.packet.PacketWrapper;
 import com.viaversion.viaversion.api.protocol.version.ProtocolVersion;
 import com.viaversion.viaversion.api.type.Types;
 import com.viaversion.viaversion.protocols.v1_11_1to1_12.Protocol1_11_1To1_12;
 import com.viaversion.viaversion.protocols.v1_9_1to1_9_3.packet.ServerboundPackets1_9_3;
 import com.viaversion.viafabricplus.protocoltranslator.ProtocolTranslator;
-import com.viaversion.viafabricplus.settings.impl.DebugSettings;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.network.ClientPlayerEntity;
 import org.jetbrains.annotations.Nullable;

diff --git a/src/main/resources/viafabricplus.mixins.json b/src/main/resources/viafabricplus.mixins.json
@@ -218,12 +218,12 @@
     "features.world.remove_server_view_distance.MixinGameOptions",
     "integration.viabedrock.MixinJoinPackets",
     "integration.vialegacy.MixinViaLegacyConfig",
-    "old.minecraft.MixinMinecraftClient",
-    "old.minecraft.entity.MixinClientPlayerEntity",
-    "old.minecraft.entity.MixinEntity",
-    "old.minecraft.entity.MixinLivingEntity",
-    "old.minecraft.entity.MixinPlayerEntity",
-    "old.minecraft.entity.MixinPlayerEntityRenderer"
+    "features.open_inventory_packet.MixinMinecraftClient",
+    "features.movement.entity.MixinClientPlayerEntity",
+    "features.movement.entity.MixinEntity",
+    "features.movement.entity.MixinLivingEntity",
+    "features.movement.entity.MixinPlayerEntity",
+    "features.movement.entity.MixinPlayerEntityRenderer"
   ],
   "injectors": {
     "defaultRequire": 1

diff --git a/visuals/build.gradle b/visuals/build.gradle
@@ -8,16 +8,13 @@ loom {
 
 dependencies {
     compileOnly project(":viafabricplus-api")
+
     modCompileOnly fabricApi.module("fabric-api-base", project.fabric_api_version)
     modCompileOnly fabricApi.module("fabric-lifecycle-events-v1", project.fabric_api_version)
 
-    // They don't matter and are only used to compile against
-    compileOnly "com.viaversion:viaversion-common:5.2.1-SNAPSHOT"
-    compileOnly ("net.raphimc:ViaLoader:3.0.4") {
-        exclude group: "com.google.guava", module: "guava"
-        exclude group: "org.slf4j", module: "slf4j-api"
-    }
-    compileOnly "net.raphimc:ViaLegacy:3.0.7-SNAPSHOT"
+    compileOnly "com.viaversion:viaversion-common:${project.viaversion_version}"
+    compileOnly "net.raphimc:ViaLoader:${project.vialoader_version}"
+    compileOnly "net.raphimc:ViaLegacy:${project.vialegacy_version}"
 }
 
 processResources {