diff --git a/buildSrc/src/main/groovy/multiloader-common.gradle b/buildSrc/src/main/groovy/multiloader-common.gradle index c13d75d..de6eaa2 100644 --- a/buildSrc/src/main/groovy/multiloader-common.gradle +++ b/buildSrc/src/main/groovy/multiloader-common.gradle @@ -64,8 +64,8 @@ processResources { // "fabric_api": fabric_api, "fabric_loader_version": fabric_loader_version, "fabric_loom": fabric_loom, - "neoforge_version": neoforge_version, - "neoforge_loader_version_range": neoforge_loader_version_range, +// "neoforge_version": neoforge_version, +// "neoforge_loader_version_range": neoforge_loader_version_range, // "quilt_loader_version": quilt_loader_version, // "quilt_fabric_api": quilt_fabric_api, // "quilt_loom": quilt_loom, diff --git a/common/src/main/java/dev/mrsnowy/teleport_commands/utils/tools.java b/common/src/main/java/dev/mrsnowy/teleport_commands/utils/tools.java index 8e284c8..ff8046d 100644 --- a/common/src/main/java/dev/mrsnowy/teleport_commands/utils/tools.java +++ b/common/src/main/java/dev/mrsnowy/teleport_commands/utils/tools.java @@ -33,7 +33,8 @@ public class tools { public static void Teleporter(ServerPlayer player, ServerLevel world, Vec3 coords) { // before teleportation effects world.sendParticles(ParticleTypes.SNOWFLAKE, player.getX(), player.getY() + 1, player.getZ(), 20, 0.0D, 0.0D, 0.0D, 0.01); - world.sendParticles(ParticleTypes.WHITE_SMOKE, player.getX(), player.getY(), player.getZ(), 15, 0.0D, 1.0D, 0.0D, 0.03); + // world.sendParticles(ParticleTypes.WHITE_SMOKE, player.getX(), player.getY(), player.getZ(), 15, 0.0D, 1.0D, 0.0D, 0.03); + world.sendParticles(ParticleTypes.WHITE_ASH, player.getX(), player.getY(), player.getZ(), 15, 0.0D, 1.0D, 0.0D, 0.03); world.playSound(null, player.blockPosition(), SoundEvent.createVariableRangeEvent(ENDERMAN_TELEPORT.getLocation()), SoundSource.PLAYERS, 0.4f, 1.0f); var flying = player.getAbilities().flying; @@ -57,7 +58,8 @@ public class tools { @Override public void run() { world.sendParticles(ParticleTypes.SNOWFLAKE, player.getX(), player.getY() , player.getZ(), 20, 0.0D, 1.0D, 0.0D, 0.01); - world.sendParticles(ParticleTypes.WHITE_SMOKE, player.getX(), player.getY(), player.getZ(), 15, 0.0D, 0.0D, 0.0D, 0.03); + // world.sendParticles(ParticleTypes.WHITE_SMOKE, player.getX(), player.getY(), player.getZ(), 15, 0.0D, 0.0D, 0.0D, 0.03); + world.sendParticles(ParticleTypes.WHITE_ASH, player.getX(), player.getY(), player.getZ(), 15, 0.0D, 0.0D, 0.0D, 0.03); } }, 100 // hopefully good, ~ 2 ticks ); @@ -133,7 +135,9 @@ public class tools { // Gets the translated text for each player based on their language, this is fully server side and actually works (UNLIKE MOJANG'S TRANSLATED KEY'S WHICH ARE CLIENT SIDE) (I'm not mad, I swear) public static MutableComponent getTranslatedText(String key, ServerPlayer player, MutableComponent... args) { - String language = player.clientInformation().language(); +// String language = player.clientInformation().language(); + String language = "en_US"; +// player.getLanguage() String regex = "%(\\d+)%"; Pattern pattern = Pattern.compile(regex); diff --git a/gradle.properties b/gradle.properties index c0d0908..1dd8204 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,18 +7,18 @@ group=dev.mrsnowy.teleport_commands java_version=21 # Common -minecraft_version=1.21 +minecraft_version=1.20.1 mod_name=Teleport Commands mod_author=Mr. Snowy mod_id=teleport_commands license=MIT credits=Mr. Snowy description=A server-side mod that adds various teleportation related commands. -minecraft_version_range=[1.21] +minecraft_version_range=[1.20.1-1.20.4] # Fabric fabric_loader_version=0.15.11 -#fabric_api=0.97.0+1.20.4 +#fabric_api=0.92.2+1.20.1 fabric_loom=1.6-SNAPSHOT # Quilt (Currently disabled since fabric port works better) @@ -28,8 +28,8 @@ fabric_loom=1.6-SNAPSHOT # NeoForge -neoforge_version=21.0.0-beta -neoforge_loader_version_range=[2,) +#neoforge_version=21.0.0-beta +#neoforge_loader_version_range=[2,) # Gradle org.gradle.jvmargs=-Xmx4G diff --git a/neoforge/build.gradle b/neoforge/build.gradle deleted file mode 100644 index e07e73b..0000000 --- a/neoforge/build.gradle +++ /dev/null @@ -1,38 +0,0 @@ -plugins { - id 'multiloader-loader' - id 'net.neoforged.gradle.userdev' version '7.0.142' -} - -// Automatically enable neoforge AccessTransformers if the file exists -// This location is hardcoded in FML and can not be changed. -// https://github.com/neoforged/FancyModLoader/blob/a952595eaaddd571fbc53f43847680b00894e0c1/loader/src/main/java/net/neoforged/fml/loading/moddiscovery/ModFile.java#L118 -def at = file('src/main/resources/META-INF/accesstransformer.cfg') -if (at.exists()) { - minecraft.accessTransformers.file at -} -runs { - configureEach { - modSource project.sourceSets.main - } - client { - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id - } - server { - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id - programArgument '--nogui' - } - - gameTestServer { - systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id - } - - data { - programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('src/generated/resources/').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath() - } -} - -sourceSets.main.resources { srcDir 'src/generated/resources' } - -dependencies { - implementation "net.neoforged:neoforge:${neoforge_version}" -} \ No newline at end of file diff --git a/neoforge/src/main/java/dev/mrsnowy/teleport_commands/neoforgeInit.java b/neoforge/src/main/java/dev/mrsnowy/teleport_commands/neoforgeInit.java deleted file mode 100644 index d51104b..0000000 --- a/neoforge/src/main/java/dev/mrsnowy/teleport_commands/neoforgeInit.java +++ /dev/null @@ -1,16 +0,0 @@ -package dev.mrsnowy.teleport_commands; - -import net.neoforged.fml.common.Mod; - -@Mod(TeleportCommands.MOD_ID) -public class neoforgeInit { - - public neoforgeInit() { - // This method is invoked by the NeoForge mod loader when it is ready - // to load your mod. You can access NeoForge and Common code in this - // project. - - TeleportCommands.MOD_LOADER = "NeoForge"; - } -} - diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml deleted file mode 100644 index 57175b6..0000000 --- a/neoforge/src/main/resources/META-INF/mods.toml +++ /dev/null @@ -1,34 +0,0 @@ -modLoader = "javafml" #mandatory -loaderVersion = "${neoforge_loader_version_range}" #mandatory -license = "${license}" # Review your options at https://choosealicense.com/. -issueTrackerURL="https://github.com/MrSn0wy/TeleportCommands/issues" #optional -[[mods]] #mandatory -modId = "${mod_id}" #mandatory -version = "${version}" #mandatory -displayName = "${mod_name}" #mandatory -#updateJSONURL="https://change.me.example.invalid/updates.json" #optional (see https://docs.neoforged.net/docs/misc/updatechecker/) -displayURL="https://github.com/MrSn0wy/TeleportCommands" #optional (displayed in the mod UI) -logoFile="${mod_id}.png" #optional -credits="${credits}" #optional -authors = "${mod_author}" #optional -description = '''${description}''' #mandatory (Supports multiline text) -[[mixins]] -config = "${mod_id}.mixins.json" -[[dependencies.${mod_id}]] #optional -modId = "neoforge" #mandatory -type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged") -versionRange = "${neoforge_loader_version_range}" #mandatory -ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory -side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER' -[[dependencies.${mod_id}]] -modId = "minecraft" -type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged") -versionRange = "${minecraft_version_range}" -ordering = "NONE" -side = "BOTH" - -# Features are specific properties of the game environment, that you may want to declare you require. This example declares -# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't -# stop your mod loading on the server for example. -#[features.${mod_id}] -#openGLVersion="[3.2,)" \ No newline at end of file diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml deleted file mode 100644 index b9de601..0000000 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ /dev/null @@ -1,34 +0,0 @@ -modLoader = "javafml" #mandatory -loaderVersion = "${neoforge_loader_version_range}" #mandatory -license = "${license}" # Review your options at https://choosealicense.com/. -#issueTrackerURL="https://change.me.to.your.issue.tracker.example.invalid/" #optional -[[mods]] #mandatory -modId = "${mod_id}" #mandatory -version = "${version}" #mandatory -displayName = "${mod_name}" #mandatory -#updateJSONURL="https://change.me.example.invalid/updates.json" #optional (see https://docs.neoforged.net/docs/misc/updatechecker/) -#displayURL="https://change.me.to.your.mods.homepage.example.invalid/" #optional (displayed in the mod UI) -logoFile="${mod_id}.png" #optional -credits="${credits}" #optional -authors = "${mod_author}" #optional -description = '''${description}''' #mandatory (Supports multiline text) -[[mixins]] -config = "${mod_id}.mixins.json" -[[dependencies.${mod_id}]] #optional -modId = "neoforge" #mandatory -type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged") -versionRange = "${neoforge_loader_version_range}" #mandatory -ordering = "NONE" # The order that this dependency should load in relation to your mod, required to be either 'BEFORE' or 'AFTER' if the dependency is not mandatory -side = "BOTH" # Side this dependency is applied on - 'BOTH', 'CLIENT' or 'SERVER' -[[dependencies.${mod_id}]] -modId = "minecraft" -type="required" #mandatory (Can be one of "required", "optional", "incompatible" or "discouraged") -versionRange = "${minecraft_version_range}" -ordering = "NONE" -side = "BOTH" - -# Features are specific properties of the game environment, that you may want to declare you require. This example declares -# that your mod requires GL version 3.2 or higher. Other features will be added. They are side aware so declaring this won't -# stop your mod loading on the server for example. -#[features.${mod_id}] -#openGLVersion="[3.2,)" \ No newline at end of file diff --git a/quilt/build.gradle b/quilt/build.gradle deleted file mode 100644 index 62ed5ca..0000000 --- a/quilt/build.gradle +++ /dev/null @@ -1,34 +0,0 @@ -plugins { - id 'multiloader-loader' - id 'org.quiltmc.loom' version "${quilt_loom}" -} - -dependencies { - minecraft "com.mojang:minecraft:${minecraft_version}" - mappings loom.layered() { - officialMojangMappings() - } - modImplementation "org.quiltmc:quilt-loader:${quilt_loader_version}" - modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:${quilt_fabric_api}" -} - -loom { - def aw = project(":common").file("src/main/resources/${mod_id}.accesswidener") - if (aw.exists()) { - accessWidenerPath.set(aw) - } - runs { - client { - client() - setConfigName("Quilt Client") - ideConfigGenerated(true) - runDir("runs/client") - } - server { - server() - setConfigName("Quilt Server") - ideConfigGenerated(true) - runDir("runs/server") - } - } -} \ No newline at end of file diff --git a/quilt/src/main/java/dev/mrsnowy/teleport_commands/quiltInit.java b/quilt/src/main/java/dev/mrsnowy/teleport_commands/quiltInit.java deleted file mode 100644 index 6c08b97..0000000 --- a/quilt/src/main/java/dev/mrsnowy/teleport_commands/quiltInit.java +++ /dev/null @@ -1,16 +0,0 @@ -package dev.mrsnowy.teleport_commands; - -import org.quiltmc.loader.api.ModContainer; -import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; - -public class quiltInit implements ModInitializer { - - @Override - public void onInitialize(ModContainer mod) { - // This code runs as soon as Minecraft is in a mod-load-ready state. - // However, some things (like resources) may still be uninitialized. - // Proceed with mild caution. - - TeleportCommands.MOD_LOADER = "Quilt"; - } -} \ No newline at end of file diff --git a/quilt/src/main/resources/quilt.mod.json b/quilt/src/main/resources/quilt.mod.json deleted file mode 100644 index 9bcbcd9..0000000 --- a/quilt/src/main/resources/quilt.mod.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "schema_version": 1, - "quilt_loader": { - "group": "${group}", - "id": "${mod_id}", - "version": "${version}", - "metadata": { - "name": "${mod_name}", - "description": "${description}", - "contributors": { - "${mod_author}": "Owner" - }, - "contact": { - "homepage": "https://mrsnowy.dev/", - "sources": "https://github.com/MrSn0wy/TeleportCommands", - "issues": "https://github.com/MrSn0wy/TeleportCommands/issues" - }, - "icon": "${mod_id}.png", - "license": "${license}" - }, - "intermediate_mappings": "net.fabricmc:intermediary", - "entrypoints": { - "init": "dev.mrsnowy.teleport_commands.quiltInit" - }, - "depends": [ - { - "id": "quilt_loader", - "versions": ">=${quilt_loader_version}" - }, - { - "id": "minecraft", - "versions": "~${minecraft_version}" - }, - { - "id": "java", - "versions": ">=${java_version}" - } - ] - }, - "mixin": "${mod_id}.mixins.json" -} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index a98bb51..2b453fa 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,14 +5,6 @@ pluginManagement { name = 'Fabric' url = uri("https://maven.fabricmc.net") } - maven { - name = 'Quilt' - url = uri("https://maven.quiltmc.org/repository/release") - } - maven { - name = 'NeoForge' - url = uri("https://maven.neoforged.net/releases") - } maven { name = 'Sponge Snapshots' url = uri("https://repo.spongepowered.org/repository/maven-public") @@ -28,5 +20,4 @@ plugins { rootProject.name = "Teleport Commands" include("common") include("fabric") -include("neoforge") //include("quilt") // disabled since the fabric port works better then the native quilt port \ No newline at end of file