enchantmentRegistry() {
+ return null;
+ }
}
diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/NoiseConfigMixin.java b/platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/mixin/lifecycle/NoiseConfigMixin.java
similarity index 96%
rename from platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/NoiseConfigMixin.java
rename to platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/mixin/lifecycle/NoiseConfigMixin.java
index 4b1b0ad78..8c39ff01d 100644
--- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/NoiseConfigMixin.java
+++ b/platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/mixin/lifecycle/NoiseConfigMixin.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.forge.mixin.lifecycle;
+package com.dfsek.terra.neoforge.mixin.lifecycle;
import net.minecraft.registry.RegistryEntryLookup;
import net.minecraft.util.math.noise.DoublePerlinNoiseSampler.NoiseParameters;
diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/package-info.java b/platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/mixin/lifecycle/package-info.java
similarity index 93%
rename from platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/package-info.java
rename to platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/mixin/lifecycle/package-info.java
index eba8981f7..cf790e8ad 100644
--- a/platforms/forge/src/main/java/com/dfsek/terra/forge/mixin/lifecycle/package-info.java
+++ b/platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/mixin/lifecycle/package-info.java
@@ -19,4 +19,4 @@
* Mixins that inject behavior into the client/server lifecycle.
*/
-package com.dfsek.terra.forge.mixin.lifecycle;
\ No newline at end of file
+package com.dfsek.terra.neoforge.mixin.lifecycle;
\ No newline at end of file
diff --git a/platforms/forge/src/main/java/com/dfsek/terra/forge/util/BiomeUtil.java b/platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/util/BiomeUtil.java
similarity index 95%
rename from platforms/forge/src/main/java/com/dfsek/terra/forge/util/BiomeUtil.java
rename to platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/util/BiomeUtil.java
index 660c750af..53d0d5b51 100644
--- a/platforms/forge/src/main/java/com/dfsek/terra/forge/util/BiomeUtil.java
+++ b/platforms/neoforge/src/main/java/com/dfsek/terra/neoforge/util/BiomeUtil.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.forge.util;
+package com.dfsek.terra.neoforge.util;
import net.minecraft.registry.RegistryKey;
import net.minecraft.registry.RegistryKeys;
@@ -16,7 +16,7 @@ import java.util.Objects;
import com.dfsek.terra.api.config.ConfigPack;
import com.dfsek.terra.api.world.biome.Biome;
-import com.dfsek.terra.forge.ForgeEntryPoint;
+import com.dfsek.terra.neoforge.ForgeEntryPoint;
import com.dfsek.terra.mod.config.PreLoadCompatibilityOptions;
import com.dfsek.terra.mod.config.ProtoPlatformBiome;
import com.dfsek.terra.mod.config.VanillaBiomeProperties;
@@ -66,7 +66,7 @@ public final class BiomeUtil {
.value(),
vanillaBiomeProperties);
- Identifier identifier = new Identifier("terra", MinecraftUtil.createBiomeID(pack, id));
+ Identifier identifier = Identifier.of("terra", MinecraftUtil.createBiomeID(pack, id));
if(ForgeRegistries.BIOMES.containsKey(identifier)) {
((ProtoPlatformBiome) biome.getPlatformBiome()).setDelegate(ForgeRegistries.BIOMES.getHolder(identifier)
diff --git a/platforms/forge/src/main/resources/META-INF/mods.toml b/platforms/neoforge/src/main/resources/META-INF/mods.toml
similarity index 100%
rename from platforms/forge/src/main/resources/META-INF/mods.toml
rename to platforms/neoforge/src/main/resources/META-INF/mods.toml
diff --git a/platforms/forge/src/main/resources/pack.mcmeta b/platforms/neoforge/src/main/resources/pack.mcmeta
similarity index 100%
rename from platforms/forge/src/main/resources/pack.mcmeta
rename to platforms/neoforge/src/main/resources/pack.mcmeta
diff --git a/platforms/forge/src/main/resources/terra.forge.mixins.json b/platforms/neoforge/src/main/resources/terra.forge.mixins.json
similarity index 83%
rename from platforms/forge/src/main/resources/terra.forge.mixins.json
rename to platforms/neoforge/src/main/resources/terra.forge.mixins.json
index 095ea9234..fcf965718 100644
--- a/platforms/forge/src/main/resources/terra.forge.mixins.json
+++ b/platforms/neoforge/src/main/resources/terra.forge.mixins.json
@@ -1,7 +1,7 @@
{
"required": true,
"minVersion": "0.8",
- "package": "com.dfsek.terra.forge.mixin",
+ "package": "com.dfsek.terra.neoforge.mixin",
"compatibilityLevel": "JAVA_21",
"mixins": [
"lifecycle.NoiseConfigMixin"
diff --git a/platforms/quilt/build.gradle.kts.disabled b/platforms/quilt/build.gradle.kts.disabled
deleted file mode 100644
index 1a5d5630f..000000000
--- a/platforms/quilt/build.gradle.kts.disabled
+++ /dev/null
@@ -1,65 +0,0 @@
-plugins {
- id("dev.architectury.loom") version Versions.Mod.architecuryLoom
- id("architectury-plugin") version Versions.Mod.architecturyPlugin
- id("io.github.juuxel.loom-vineflower") version Versions.Mod.loomVineflower
-}
-
-architectury {
- platformSetupLoomIde()
- loader("quilt")
-}
-
-dependencies {
- shadedApi(project(":common:implementation:base"))
-
- annotationProcessor("net.fabricmc:sponge-mixin:${Versions.Mod.mixin}")
- annotationProcessor("dev.architectury:architectury-loom:${Versions.Mod.architecuryLoom}")
-
-
- implementation(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
- "developmentQuilt"(project(path = ":platforms:mixin-common", configuration = "namedElements")) { isTransitive = false }
- shaded(project(path = ":platforms:mixin-common", configuration = "transformProductionQuilt")) { isTransitive = false }
-
- implementation(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
- "developmentQuilt"(project(path = ":platforms:mixin-lifecycle", configuration = "namedElements")) { isTransitive = false }
- shaded(project(path = ":platforms:mixin-lifecycle", configuration = "transformProductionQuilt")) { isTransitive = false }
-
- minecraft("com.mojang:minecraft:${Versions.Mod.minecraft}")
- mappings("net.fabricmc:yarn:${Versions.Mod.yarn}:v2")
-
- modImplementation("org.quiltmc:quilt-loader:${Versions.Quilt.quiltLoader}")
-
- modImplementation("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${Versions.Quilt.fabricApi}")
-
- modImplementation("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
- exclude("net.fabricmc")
- exclude("net.fabricmc.fabric-api")
- }
- include("cloud.commandframework", "cloud-fabric", Versions.Libraries.cloud) {
- exclude("net.fabricmc")
- exclude("net.fabricmc.fabric-api")
- }
-}
-
-loom {
- accessWidenerPath.set(project(":platforms:mixin-common").file("src/main/resources/terra.accesswidener"))
-
- mixin {
- defaultRefmapName.set("terra.quilt.refmap.json")
- }
-}
-
-
-addonDir(project.file("./run/config/Terra/addons"), tasks.named("configureLaunch").get())
-
-tasks {
- compileJava {
- options.release.set(17)
- }
-
- remapJar {
- injectAccessWidener.set(true)
- inputFile.set(shadowJar.get().archiveFile)
- archiveFileName.set("${rootProject.name.replaceFirstChar { if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() })}-quilt-${project.version}.jar")
- }
-}
diff --git a/platforms/quilt/gradle.properties b/platforms/quilt/gradle.properties
deleted file mode 100644
index 96758ce85..000000000
--- a/platforms/quilt/gradle.properties
+++ /dev/null
@@ -1 +0,0 @@
-loom.platform=quilt
\ No newline at end of file
diff --git a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/AwfulQuiltHacks.java b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/AwfulQuiltHacks.java
deleted file mode 100644
index 6dbcbaff4..000000000
--- a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/AwfulQuiltHacks.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.dfsek.terra.quilt;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-
-
-/**
- * So you want to Mixin into Authlib/Brigadier/DataFixerUpper, on Fabric you'll need this guy.
- *
- * YOU SHOULD ONLY USE THIS CLASS DURING "preLaunch" and ONLY TARGET A CLASS WHICH IS NOT ANY CLASS YOU MIXIN TO.
- *
- * This will likely not work on Gson because FabricLoader has some special logic related to Gson.
- */
-public final class AwfulQuiltHacks {
- private static final ClassLoader KNOT_CLASSLOADER = Thread.currentThread().getContextClassLoader();
- private static final Method ADD_URL_METHOD;
- static {
- Method tempAddUrlMethod = null;
- try {
- tempAddUrlMethod = KNOT_CLASSLOADER.getClass().getMethod("addURL", URL.class);
- tempAddUrlMethod.setAccessible(true);
- } catch(ReflectiveOperationException e) {
- throw new RuntimeException("Failed to load Classloader fields", e);
- }
-
- ADD_URL_METHOD = tempAddUrlMethod;
- }
-
- private AwfulQuiltHacks() { }
-
- /**
- * Hackily load the package which a mixin may exist within.
- *
- * YOU SHOULD NOT TARGET A CLASS WHICH YOU MIXIN TO.
- *
- * @param pathOfAClass The path of any class within the package.
- */
- public static void hackilyLoadForMixin(String pathOfAClass)
- throws ClassNotFoundException, InvocationTargetException, IllegalAccessException {
- URL url = Class.forName(pathOfAClass).getProtectionDomain().getCodeSource().getLocation();
- ADD_URL_METHOD.invoke(KNOT_CLASSLOADER, url);
- }
-}
diff --git a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltAddon.java b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltAddon.java
deleted file mode 100644
index f0767fdcf..000000000
--- a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltAddon.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.dfsek.terra.quilt;
-
-import com.dfsek.terra.mod.MinecraftAddon;
-import com.dfsek.terra.mod.ModPlatform;
-
-
-public class QuiltAddon extends MinecraftAddon {
-
- public QuiltAddon(ModPlatform modPlatform) {
- super(modPlatform);
- }
-
- @Override
- public String getID() {
- return "terra-quilt";
- }
-}
\ No newline at end of file
diff --git a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltEntryPoint.java b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltEntryPoint.java
deleted file mode 100644
index 7ddfbd58a..000000000
--- a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltEntryPoint.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * This file is part of Terra.
- *
- * Terra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Terra is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Terra. If not, see .
- */
-
-package com.dfsek.terra.quilt;
-
-import org.quiltmc.loader.api.ModContainer;
-import org.quiltmc.qsl.base.api.entrypoint.ModInitializer;
-
-import com.dfsek.terra.lifecycle.LifecycleEntryPoint;
-
-
-public class QuiltEntryPoint extends LifecycleEntryPoint implements ModInitializer {
- private static final QuiltPlatform TERRA_PLUGIN = new QuiltPlatform();
-
- @Override
- public void onInitialize(ModContainer container) {
- initialize("Quilt", TERRA_PLUGIN);
- }
-}
diff --git a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java
deleted file mode 100644
index 47910f518..000000000
--- a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPlatform.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * This file is part of Terra.
- *
- * Terra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Terra is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Terra. If not, see .
- */
-
-package com.dfsek.terra.quilt;
-
-import org.jetbrains.annotations.NotNull;
-import org.quiltmc.loader.api.QuiltLoader;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.stream.Collectors;
-
-import com.dfsek.terra.api.addon.BaseAddon;
-import com.dfsek.terra.lifecycle.LifecyclePlatform;
-
-
-public class QuiltPlatform extends LifecyclePlatform {
-
- @Override
- protected Collection getPlatformMods() {
- return QuiltLoader.getAllMods()
- .stream()
- .flatMap(mod -> parseModData(mod.metadata().id(), mod.metadata().version().raw(), "quilt"))
- .collect(
- Collectors.toList());
- }
-
- @Override
- public @NotNull String platformName() {
- return "Quilt";
- }
-
- @Override
- public @NotNull File getDataFolder() {
- return new File(QuiltLoader.getConfigDir().toFile(), "Terra");
- }
-
- @Override
- public BaseAddon getPlatformAddon() {
- return new QuiltAddon(this);
- }
-}
diff --git a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPreLaunchEntryPoint.java b/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPreLaunchEntryPoint.java
deleted file mode 100644
index e4d8cc0aa..000000000
--- a/platforms/quilt/src/main/java/com/dfsek/terra/quilt/QuiltPreLaunchEntryPoint.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.dfsek.terra.quilt;
-
-import cloud.commandframework.brigadier.BrigadierMappingBuilder;
-import org.quiltmc.loader.api.ModContainer;
-import org.quiltmc.loader.api.QuiltLoader;
-import org.quiltmc.loader.api.entrypoint.PreLaunchEntrypoint;
-
-import java.lang.reflect.InvocationTargetException;
-
-
-public class QuiltPreLaunchEntryPoint implements PreLaunchEntrypoint {
- @Override
- public void onPreLaunch(ModContainer mod) {
- if(QuiltLoader.isDevelopmentEnvironment()) {
- try {
- AwfulQuiltHacks.hackilyLoadForMixin(BrigadierMappingBuilder.class.getName());
- } catch(ClassNotFoundException | InvocationTargetException | IllegalAccessException e) {
- throw new RuntimeException(e);
- }
- }
- }
-}
diff --git a/platforms/quilt/src/main/resources/assets/terra/icon.png b/platforms/quilt/src/main/resources/assets/terra/icon.png
deleted file mode 100644
index a8f458866..000000000
Binary files a/platforms/quilt/src/main/resources/assets/terra/icon.png and /dev/null differ
diff --git a/platforms/quilt/src/main/resources/assets/terra/lang/en_us.json b/platforms/quilt/src/main/resources/assets/terra/lang/en_us.json
deleted file mode 100644
index 116199214..000000000
--- a/platforms/quilt/src/main/resources/assets/terra/lang/en_us.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
- "generator.terra": "Terra"
-}
-
diff --git a/platforms/quilt/src/main/resources/quilt.mod.json b/platforms/quilt/src/main/resources/quilt.mod.json
deleted file mode 100644
index 3f1ad2232..000000000
--- a/platforms/quilt/src/main/resources/quilt.mod.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "schema_version": 1,
- "quilt_loader": {
- "group": "com.dfsek",
- "id": "terra",
- "version": "@VERSION@",
- "metadata": {
- "name": "Terra",
- "description": "@DESCRIPTION@",
- "authors": [
- "dfsek"
- ],
- "contact": {
- "homepage": "@WIKI@",
- "sources": "@SOURCE@",
- "issues": "@ISSUES@"
- },
- "license": "@LICENSE@",
- "icon": "assets/terra/icon.png"
- },
- "environment": "*",
- "intermediate_mappings": "net.fabricmc:intermediary",
- "entrypoints": {
- "init": [
- "com.dfsek.terra.quilt.QuiltEntryPoint"
- ],
- "pre_launch": [
- "com.dfsek.terra.quilt.QuiltPreLaunchEntryPoint"
- ]
- },
- "depends": [
- {
- "id": "quilt_loader",
- "version": ">=0.17.0"
- },
- {
- "id": "java",
- "version": ">=17"
- },
- {
- "id": "minecraft",
- "version": "1.20.x"
- },
- {
- "id": "quilted_fabric_api",
- "versions": ">=2.0.0-"
- }
- ]
- },
- "mixin": [
- "terra.quilt.mixins.json",
- "terra.lifecycle.mixins.json",
- "terra.common.mixins.json"
- ]
-}
\ No newline at end of file
diff --git a/platforms/quilt/src/main/resources/terra.quilt.mixins.json b/platforms/quilt/src/main/resources/terra.quilt.mixins.json
deleted file mode 100644
index 84ca8264a..000000000
--- a/platforms/quilt/src/main/resources/terra.quilt.mixins.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "required": true,
- "minVersion": "0.8",
- "package": "com.dfsek.terra.quilt.mixin",
- "compatibilityLevel": "JAVA_21",
- "mixins": [
- ],
- "client": [
- ],
- "server": [
- ],
- "injectors": {
- "defaultRequire": 1
- }
-}
\ No newline at end of file