From c33dbaf0e80d7cd8e8efccb219330be17efeaa09 Mon Sep 17 00:00:00 2001 From: XyperCode Date: Tue, 4 Jun 2024 14:39:39 +0200 Subject: [PATCH] Runs and can load worlds now. --- .../dev/ultreon/devices/mixin/common/MixinPlugin.java | 2 +- .../com.ultreon.devices.isolated.storage.DataStorage | 2 -- .../dev.ultreon.devices.isolated.storage.DataStorage | 2 ++ common/src/main/resources/devices-common.mixins.json | 4 ++-- ...Registry => dev.ultreon.devices.client.RenderRegistry} | 0 fabric/src/main/resources/devices.mixins.json | 2 +- forge/build.gradle | 8 ++++---- ...Registry => dev.ultreon.devices.client.RenderRegistry} | 0 forge/src/main/resources/devices.mixins.json | 2 +- ...Registry => dev.ultreon.devices.client.RenderRegistry} | 0 neoforge/src/main/resources/devices.mixins.json | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 common/src/main/resources/META-INF/services/com.ultreon.devices.isolated.storage.DataStorage create mode 100644 common/src/main/resources/META-INF/services/dev.ultreon.devices.isolated.storage.DataStorage rename fabric/src/main/resources/META-INF/services/{com.ultreon.devices.client.RenderRegistry => dev.ultreon.devices.client.RenderRegistry} (100%) rename forge/src/main/resources/META-INF/services/{com.ultreon.devices.client.RenderRegistry => dev.ultreon.devices.client.RenderRegistry} (100%) rename neoforge/src/main/resources/META-INF/services/{com.ultreon.devices.client.RenderRegistry => dev.ultreon.devices.client.RenderRegistry} (100%) diff --git a/common/src/main/java/dev/ultreon/devices/mixin/common/MixinPlugin.java b/common/src/main/java/dev/ultreon/devices/mixin/common/MixinPlugin.java index 737fb278d..0acb20656 100644 --- a/common/src/main/java/dev/ultreon/devices/mixin/common/MixinPlugin.java +++ b/common/src/main/java/dev/ultreon/devices/mixin/common/MixinPlugin.java @@ -39,7 +39,7 @@ public List getMixins() { } private static String getTrueName(String internalName) { - if (internalName.startsWith("com/ultreon/devices")) { + if (internalName.startsWith("dev/ultreon/devices")) { return ArchitecturyTarget.getCurrentTarget() + "/" + internalName; } return internalName; diff --git a/common/src/main/resources/META-INF/services/com.ultreon.devices.isolated.storage.DataStorage b/common/src/main/resources/META-INF/services/com.ultreon.devices.isolated.storage.DataStorage deleted file mode 100644 index af66b1dc9..000000000 --- a/common/src/main/resources/META-INF/services/com.ultreon.devices.isolated.storage.DataStorage +++ /dev/null @@ -1,2 +0,0 @@ -com.ultreon.devices.impl.storage.ResourceStorage -com.ultreon.devices.impl.storage.FileStorage \ No newline at end of file diff --git a/common/src/main/resources/META-INF/services/dev.ultreon.devices.isolated.storage.DataStorage b/common/src/main/resources/META-INF/services/dev.ultreon.devices.isolated.storage.DataStorage new file mode 100644 index 000000000..ceaca7dd3 --- /dev/null +++ b/common/src/main/resources/META-INF/services/dev.ultreon.devices.isolated.storage.DataStorage @@ -0,0 +1,2 @@ +dev.ultreon.devices.impl.storage.ResourceStorage +dev.ultreon.devices.impl.storage.FileStorage \ No newline at end of file diff --git a/common/src/main/resources/devices-common.mixins.json b/common/src/main/resources/devices-common.mixins.json index d58fdf27c..497ff93be 100644 --- a/common/src/main/resources/devices-common.mixins.json +++ b/common/src/main/resources/devices-common.mixins.json @@ -1,9 +1,9 @@ { "required": true, "minVersion": "0.8", - "package": "com.ultreon.devices.mixin.common", + "package": "dev.ultreon.devices.mixin.common", "compatibilityLevel": "JAVA_17", - "plugin": "com.ultreon.devices.mixin.common.MixinPlugin", + "plugin": "dev.ultreon.devices.mixin.common.MixinPlugin", "mixins": [ ], diff --git a/fabric/src/main/resources/META-INF/services/com.ultreon.devices.client.RenderRegistry b/fabric/src/main/resources/META-INF/services/dev.ultreon.devices.client.RenderRegistry similarity index 100% rename from fabric/src/main/resources/META-INF/services/com.ultreon.devices.client.RenderRegistry rename to fabric/src/main/resources/META-INF/services/dev.ultreon.devices.client.RenderRegistry diff --git a/fabric/src/main/resources/devices.mixins.json b/fabric/src/main/resources/devices.mixins.json index 2d5cbb52c..9de9a033d 100644 --- a/fabric/src/main/resources/devices.mixins.json +++ b/fabric/src/main/resources/devices.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "com.ultreon.devices.mixin.fabric", + "package": "dev.ultreon.devices.mixin.fabric", "compatibilityLevel": "JAVA_17", "mixins": [ ], diff --git a/forge/build.gradle b/forge/build.gradle index fca651512..540ecb878 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -71,11 +71,11 @@ shadowJar { configurations = [project.configurations.shadowCommon] archiveClassifier = "dev-shadow" -// relocate 'org.jetbrains.kotlin', "com.ultreon.devices.shadow.org.jetbrains.kotlin" -// relocate 'org.jetbrains.kotlinx', "com.ultreon.devices.shadow.org.jetbrains.kotlinx" +// relocate 'org.jetbrains.kotlin', "dev.ultreon.devices.shadow.org.jetbrains.kotlin" +// relocate 'org.jetbrains.kotlinx', "dev.ultreon.devices.shadow.org.jetbrains.kotlinx" // -// relocate 'kotlin', "com.ultreon.devices.shadow.kotlin" -// relocate 'kotlinx', "com.ultreon.devices.shadow.kotlinx" +// relocate 'kotlin', "dev.ultreon.devices.shadow.kotlin" +// relocate 'kotlinx', "dev.ultreon.devices.shadow.kotlinx" } remapJar { diff --git a/forge/src/main/resources/META-INF/services/com.ultreon.devices.client.RenderRegistry b/forge/src/main/resources/META-INF/services/dev.ultreon.devices.client.RenderRegistry similarity index 100% rename from forge/src/main/resources/META-INF/services/com.ultreon.devices.client.RenderRegistry rename to forge/src/main/resources/META-INF/services/dev.ultreon.devices.client.RenderRegistry diff --git a/forge/src/main/resources/devices.mixins.json b/forge/src/main/resources/devices.mixins.json index 7a404d86a..064b602d2 100644 --- a/forge/src/main/resources/devices.mixins.json +++ b/forge/src/main/resources/devices.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "com.ultreon.devices.devices.mixin.forge", + "package": "dev.ultreon.devices.devices.mixin.forge", "compatibilityLevel": "JAVA_17", "mixins": [ ], diff --git a/neoforge/src/main/resources/META-INF/services/com.ultreon.devices.client.RenderRegistry b/neoforge/src/main/resources/META-INF/services/dev.ultreon.devices.client.RenderRegistry similarity index 100% rename from neoforge/src/main/resources/META-INF/services/com.ultreon.devices.client.RenderRegistry rename to neoforge/src/main/resources/META-INF/services/dev.ultreon.devices.client.RenderRegistry diff --git a/neoforge/src/main/resources/devices.mixins.json b/neoforge/src/main/resources/devices.mixins.json index 7a404d86a..064b602d2 100644 --- a/neoforge/src/main/resources/devices.mixins.json +++ b/neoforge/src/main/resources/devices.mixins.json @@ -1,7 +1,7 @@ { "required": true, "minVersion": "0.8", - "package": "com.ultreon.devices.devices.mixin.forge", + "package": "dev.ultreon.devices.devices.mixin.forge", "compatibilityLevel": "JAVA_17", "mixins": [ ],