From f34d13a0cc277d6c23fcb8234855dd7aa49f4b83 Mon Sep 17 00:00:00 2001 From: newt Date: Sat, 31 Aug 2024 23:25:10 +0100 Subject: [PATCH] chore: remove quilt specific build + fabric api + architectury api --- arrow.webp | Bin 0 -> 3682 bytes .../PersistentProjectileEntityMixin.java | 29 ++++---- .../main/resources/projectileding.mixins.json | 4 +- fabric-like/build.gradle | 13 ---- .../fabriclike/ProjectileDingFabricLike.java | 10 --- fabric/build.gradle | 8 --- .../fabric/ProjectileDingFabric.java | 11 +-- .../client/ProjectileDingFabricClient.java | 10 --- fabric/src/main/resources/fabric.mod.json | 7 +- gradle.properties | 5 +- neoforge/build.gradle | 3 - quilt/build.gradle | 66 ------------------ quilt/gradle.properties | 1 - .../quilt/ProjectileDingQuilt.java | 14 ---- quilt/src/main/resources/quilt.mod.json | 43 ------------ readme.md | 17 ++++- settings.gradle | 2 - 17 files changed, 34 insertions(+), 209 deletions(-) create mode 100644 arrow.webp rename common/src/main/java/dev/newty/projectileding/mixin/{client => }/PersistentProjectileEntityMixin.java (51%) delete mode 100644 fabric-like/build.gradle delete mode 100644 fabric-like/src/main/java/dev/newty/projectileding/fabriclike/ProjectileDingFabricLike.java delete mode 100644 fabric/src/main/java/dev/newty/projectileding/fabric/client/ProjectileDingFabricClient.java delete mode 100644 quilt/build.gradle delete mode 100644 quilt/gradle.properties delete mode 100644 quilt/src/main/java/dev/newty/projectileding/quilt/ProjectileDingQuilt.java delete mode 100644 quilt/src/main/resources/quilt.mod.json diff --git a/arrow.webp b/arrow.webp new file mode 100644 index 0000000000000000000000000000000000000000..1bd04a0722ea0b52e7256f1b79f175b005a1675d GIT binary patch literal 3682 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.16.3", "minecraft": "~1.21", - "java": ">=21", - "architectury": ">=13.0.2", - "fabric-api": "*" + "java": ">=21" }, "suggests": { "another-mod": "*" diff --git a/gradle.properties b/gradle.properties index 32dcea0..5a75dd7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.parallel=true mod_version = 1.0.0 maven_group = dev.newty archives_name = projectileding -enabled_platforms = fabric,neoforge,quilt +enabled_platforms = fabric,neoforge # Minecraft properties minecraft_version = 1.21 @@ -15,8 +15,5 @@ yarn_mappings = 1.21+build.1 # Dependencies architectury_api_version = 13.0.2 fabric_loader_version = 0.16.3 -fabric_api_version = 0.102.0+1.21 neoforge_version = 21.0.42-beta yarn_mappings_patch_neoforge_version = 1.21+build.4 -quilt_loader_version = 0.26.4-beta.5 -quilted_fabric_api_version = 11.0.0-alpha.3+0.100.7-1.21 diff --git a/neoforge/build.gradle b/neoforge/build.gradle index 471864e..08f6354 100644 --- a/neoforge/build.gradle +++ b/neoforge/build.gradle @@ -34,9 +34,6 @@ repositories { dependencies { neoForge "net.neoforged:neoforge:$rootProject.neoforge_version" - // Architectury API. This is optional, and you can comment it out if you don't need it. - modImplementation "dev.architectury:architectury-neoforge:$rootProject.architectury_api_version" - common(project(path: ':common', configuration: 'namedElements')) { transitive false } shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge') } diff --git a/quilt/build.gradle b/quilt/build.gradle deleted file mode 100644 index 345c0ca..0000000 --- a/quilt/build.gradle +++ /dev/null @@ -1,66 +0,0 @@ -plugins { - id 'com.github.johnrengelman.shadow' -} - -repositories { - maven { url 'https://maven.quiltmc.org/repository/release/' } -} - -architectury { - platformSetupLoomIde() - loader('quilt') -} - -configurations { - common { - canBeResolved = true - canBeConsumed = false - } - compileClasspath.extendsFrom common - runtimeClasspath.extendsFrom common - developmentQuilt.extendsFrom common - - // Files in this configuration will be bundled into your mod using the Shadow plugin. - // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files. - shadowBundle { - canBeResolved = true - canBeConsumed = false - } -} - -dependencies { - modImplementation "org.quiltmc:quilt-loader:$rootProject.quilt_loader_version" - - // Quilt Standard Libraries and QSL. - modImplementation "org.quiltmc.quilted-fabric-api:quilted-fabric-api:$rootProject.quilted_fabric_api_version" - - // Architectury API. This is optional, and you can comment it out if you don't need it. - modImplementation("dev.architectury:architectury-fabric:$rootProject.architectury_api_version") { - // We must not pull Fabric Loader and Fabric API from Architectury Fabric. - exclude group: 'net.fabricmc' - exclude group: 'net.fabricmc.fabric-api' - } - - common(project(path: ':common', configuration: 'namedElements')) { transitive false } - shadowBundle project(path: ':common', configuration: 'transformProductionQuilt') - common(project(path: ':fabric-like', configuration: 'namedElements')) { transitive false } - shadowBundle project(path: ':fabric-like', configuration: 'transformProductionQuilt') -} - -processResources { - inputs.property 'group', project.group - inputs.property 'version', project.version - - filesMatching('quilt.mod.json') { - expand group: project.group, version: project.version - } -} - -shadowJar { - configurations = [project.configurations.shadowBundle] - archiveClassifier = 'dev-shadow' -} - -remapJar { - input.set shadowJar.archiveFile -} diff --git a/quilt/gradle.properties b/quilt/gradle.properties deleted file mode 100644 index 56fe802..0000000 --- a/quilt/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -loom.platform = quilt diff --git a/quilt/src/main/java/dev/newty/projectileding/quilt/ProjectileDingQuilt.java b/quilt/src/main/java/dev/newty/projectileding/quilt/ProjectileDingQuilt.java deleted file mode 100644 index 8c445fa..0000000 --- a/quilt/src/main/java/dev/newty/projectileding/quilt/ProjectileDingQuilt.java +++ /dev/null @@ -1,14 +0,0 @@ -package dev.newty.projectileding.quilt; - -import org.quiltmc.loader.api.ModContainer; -import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; - -import dev.newty.projectileding.fabriclike.ProjectileDingFabricLike; - -public final class ProjectileDingQuilt implements ModInitializer { - @Override - public void onInitialize(ModContainer mod) { - // Run the Fabric-like setup. - ProjectileDingFabricLike.init(); - } -} diff --git a/quilt/src/main/resources/quilt.mod.json b/quilt/src/main/resources/quilt.mod.json deleted file mode 100644 index 5d3fb53..0000000 --- a/quilt/src/main/resources/quilt.mod.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "schema_version": 1, - "quilt_loader": { - "group": "${group}", - "id": "projectileding", - "version": "${version}", - "metadata": { - "name": "ProjectileDing", - "description": "This is an example description! Tell everyone what your mod is about!", - "contributors": { - "Me!": "Author" - }, - "icon": "assets/projectileding/icon.png" - }, - "intermediate_mappings": "net.fabricmc:intermediary", - "entrypoints": { - "init": [ - "dev.newty.quilt.ExampleModQuilt" - ] - }, - "depends": [ - { - "id": "quilt_loader", - "version": "*" - }, - { - "id": "quilt_base", - "version": "*" - }, - { - "id": "minecraft", - "version": ">=1.21" - }, - { - "id": "architectury", - "version": ">=13.0.2" - } - ] - }, - "mixin": [ - "projectileding.mixins.json" - ] -} diff --git a/readme.md b/readme.md index 2081b16..3f072ab 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,20 @@
-

DrinkableXP

+ +

ProjectileDing

+[![Modrinth Downloads](https://img.shields.io/modrinth/dt/INLXGXFI?style=for-the-badge&logo=modrinth&color=a79aff)](https://modrinth.com/mod/projectile-ding) + +Plays the ENTITY_ARROW_HIT_PLAYER sound effect whenever you hit a living entity with an arrow. You can find a +demonstration of the mod in action on YouTube [here](https://www.youtube.com/watch?v=WpB4vh8CIRk). + +### Supported versions of Minecraft + +- 1.21.1 + +### Supported mod loaders + +- [Fabric](https://fabricmc.net/)/[Quilt](https://quiltmc.org/en/) +- [NeoForge](https://neoforged.net/) + This project is licensed with the Opinionated Queer License v1.2 - you can view it here. \ No newline at end of file diff --git a/settings.gradle b/settings.gradle index df05047..5aeac91 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,6 +11,4 @@ rootProject.name = 'projectileding' include 'common' include 'fabric' -include 'fabric-like' include 'neoforge' -include 'quilt'