From d8d2d15f9ecebf667478a61801ae478f67f65c0b Mon Sep 17 00:00:00 2001 From: Yeregorix Date: Thu, 3 Oct 2024 15:50:10 +0200 Subject: [PATCH] Set mixins parent --- forge/src/mixins/resources/mixins.spongeforge.api.json | 4 +--- forge/src/mixins/resources/mixins.spongeforge.core.json | 4 +--- .../src/mixins/resources/mixins.spongeforge.tracker.json | 4 +--- neoforge/src/mixins/resources/mixins.spongeneo.api.json | 4 +--- neoforge/src/mixins/resources/mixins.spongeneo.core.json | 4 +--- .../src/mixins/resources/mixins.spongeneo.tracker.json | 4 +--- src/mixins/resources/mixins.sponge.exploit.json | 5 +---- src/test/resources/mixins.common.test.json | 9 ++------- .../mixins/resources/mixins.spongevanilla.tracker.json | 4 +--- 9 files changed, 10 insertions(+), 32 deletions(-) diff --git a/forge/src/mixins/resources/mixins.spongeforge.api.json b/forge/src/mixins/resources/mixins.spongeforge.api.json index afbe11ab0d7..e0877be33a7 100644 --- a/forge/src/mixins/resources/mixins.spongeforge.api.json +++ b/forge/src/mixins/resources/mixins.spongeforge.api.json @@ -1,9 +1,7 @@ { "required": true, - "minVersion": "0.8", + "parent": "mixins.sponge.parent.json", "package": "org.spongepowered.forge.mixin.api", - "target": "@env(DEFAULT)", - "compatibilityLevel": "JAVA_8", "priority": 1300, "mixins": [ "minecraft.server.MinecraftServerMixin_Forge_API" diff --git a/forge/src/mixins/resources/mixins.spongeforge.core.json b/forge/src/mixins/resources/mixins.spongeforge.core.json index da3dc932a54..7f90dbd9ccc 100644 --- a/forge/src/mixins/resources/mixins.spongeforge.core.json +++ b/forge/src/mixins/resources/mixins.spongeforge.core.json @@ -1,9 +1,7 @@ { "required": true, - "minVersion": "0.8", + "parent": "mixins.sponge.parent.json", "package": "org.spongepowered.forge.mixin.core", - "target": "@env(DEFAULT)", - "compatibilityLevel": "JAVA_8", "priority": 1301, "mixins": [ "api.event.EventMixin_Forge", diff --git a/forge/src/mixins/resources/mixins.spongeforge.tracker.json b/forge/src/mixins/resources/mixins.spongeforge.tracker.json index 3061f2ca8ce..6cc9610e1c9 100644 --- a/forge/src/mixins/resources/mixins.spongeforge.tracker.json +++ b/forge/src/mixins/resources/mixins.spongeforge.tracker.json @@ -1,9 +1,7 @@ { "required": true, - "minVersion": "0.8", + "parent": "mixins.sponge.parent.json", "package": "org.spongepowered.forge.mixin.tracker", - "target": "@env(DEFAULT)", - "compatibilityLevel": "JAVA_8", "priority": 1302, "mixins": [ "server.level.ServerPlayerGameModeMixin_Forge_Tracker", diff --git a/neoforge/src/mixins/resources/mixins.spongeneo.api.json b/neoforge/src/mixins/resources/mixins.spongeneo.api.json index 7821db758a7..6e69cd3f317 100644 --- a/neoforge/src/mixins/resources/mixins.spongeneo.api.json +++ b/neoforge/src/mixins/resources/mixins.spongeneo.api.json @@ -1,9 +1,7 @@ { "required": true, - "minVersion": "0.8", + "parent": "mixins.sponge.parent.json", "package": "org.spongepowered.neoforge.mixin.api", - "target": "@env(DEFAULT)", - "compatibilityLevel": "JAVA_8", "priority": 1300, "mixins": [ "minecraft.server.MinecraftServerMixin_Neo_API" diff --git a/neoforge/src/mixins/resources/mixins.spongeneo.core.json b/neoforge/src/mixins/resources/mixins.spongeneo.core.json index f2ae877dd2f..00798c2c4a6 100644 --- a/neoforge/src/mixins/resources/mixins.spongeneo.core.json +++ b/neoforge/src/mixins/resources/mixins.spongeneo.core.json @@ -1,9 +1,7 @@ { "required": true, - "minVersion": "0.8", + "parent": "mixins.sponge.parent.json", "package": "org.spongepowered.neoforge.mixin.core", - "target": "@env(DEFAULT)", - "compatibilityLevel": "JAVA_8", "priority": 1301, "mixins": [ "api.event.EventMixin_Neo", diff --git a/neoforge/src/mixins/resources/mixins.spongeneo.tracker.json b/neoforge/src/mixins/resources/mixins.spongeneo.tracker.json index 3373537b0b2..91b3c76d80c 100644 --- a/neoforge/src/mixins/resources/mixins.spongeneo.tracker.json +++ b/neoforge/src/mixins/resources/mixins.spongeneo.tracker.json @@ -1,9 +1,7 @@ { "required": true, - "minVersion": "0.8", + "parent": "mixins.sponge.parent.json", "package": "org.spongepowered.neoforge.mixin.tracker", - "target": "@env(DEFAULT)", - "compatibilityLevel": "JAVA_8", "priority": 1302, "mixins": [ "server.level.ServerPlayerGameModeMixin_Neo_Tracker", diff --git a/src/mixins/resources/mixins.sponge.exploit.json b/src/mixins/resources/mixins.sponge.exploit.json index b6d589077f9..ca578c7673c 100644 --- a/src/mixins/resources/mixins.sponge.exploit.json +++ b/src/mixins/resources/mixins.sponge.exploit.json @@ -4,8 +4,5 @@ "plugin": "org.spongepowered.common.mixin.plugin.ExploitPlugin", "mixins": [ "world.item.WritableBookItemMixin_LimitBookSize" - ], - "injectors": { - "defaultRequire": 1 - } + ] } \ No newline at end of file diff --git a/src/test/resources/mixins.common.test.json b/src/test/resources/mixins.common.test.json index 1d29ad500fc..5fb635730bb 100644 --- a/src/test/resources/mixins.common.test.json +++ b/src/test/resources/mixins.common.test.json @@ -1,16 +1,11 @@ { "required": true, - "minVersion": "0.7", + "parent": "mixins.sponge.parent.json", "package": "org.spongepowered.common.launch.mixin", - "target": "@env(DEFAULT)", - "compatibilityLevel": "JAVA_8", "mixinPriority": 11111, "mixins": [ "ItemMixin_Test", "SchematicTranslatorMixin_Test", "SpongeImplHooksMixin_Test" - ], - "injectors": { - "defaultRequire": 1 - } + ] } diff --git a/vanilla/src/mixins/resources/mixins.spongevanilla.tracker.json b/vanilla/src/mixins/resources/mixins.spongevanilla.tracker.json index f0636d2112b..de77166a03a 100644 --- a/vanilla/src/mixins/resources/mixins.spongevanilla.tracker.json +++ b/vanilla/src/mixins/resources/mixins.spongevanilla.tracker.json @@ -1,9 +1,7 @@ { "required": true, - "minVersion": "0.8", + "parent": "mixins.sponge.parent.json", "package": "org.spongepowered.vanilla.mixin.tracker", - "target": "@env(DEFAULT)", - "compatibilityLevel": "JAVA_21", "priority": 1302, "mixins": [ "server.level.ServerPlayerGameModeMixin_Vanilla_Tracker",