From b777f7af9d618d0f2c0fbbf0805fb5cfda76337e Mon Sep 17 00:00:00 2001 From: tr7zw Date: Wed, 24 Apr 2024 00:58:22 +0200 Subject: [PATCH] Update to 1.20.5 --- .github/workflows/build.yml | 38 ++++++----- .github/workflows/tag.yml | 61 ++++-------------- .gitignore | 8 +++ .../src/main/resources/fabric.mod.json | 29 --------- gradle-compose.yml | 34 ++-------- gradle/gradle-compose.jar | Bin 851166 -> 852739 bytes settings.json | 5 ++ .../dev/tr7zw/entityculling/CullTask.java | 0 .../tr7zw/entityculling/EntityCullingMod.java | 0 .../entityculling/EntityCullingModBase.java | 0 .../dev/tr7zw/entityculling/Provider.java | 0 .../access/EntityRendererInter.java | 2 +- .../BlockEntityRenderDispatcherMixin.java | 0 .../entityculling/mixin/ClientWorldMixin.java | 0 .../entityculling/mixin/CullableMixin.java | 0 .../entityculling/mixin/DebugHudMixin.java | 0 .../mixin/EntityRendererMixin.java | 6 +- .../mixin/WorldRendererMixin.java | 2 +- .../assets/entityculling/lang/en_us.json | 0 .../assets/entityculling/lang/fr_fr.json | 0 .../assets/entityculling/lang/it_it.json | 0 .../assets/entityculling/lang/pt_br.json | 0 .../assets/entityculling/lang/ru_ru.json | 0 .../assets/entityculling/lang/uk_ua.json | 0 .../assets/entityculling/lang/vi_vn.json | 0 .../assets/entityculling/lang/zh_tw.json | 8 +-- .../main/resources/entityculling.mixins.json | 0 .../main/resources}/icon.png | Bin .../test/java/dev/tr7zw/tests/MixinTests.java | 0 versions/mainProject | 1 + 30 files changed, 59 insertions(+), 135 deletions(-) delete mode 100644 EntityCulling-Fabric/src/main/resources/fabric.mod.json create mode 100644 settings.json rename {Shared/src => src}/main/java/dev/tr7zw/entityculling/CullTask.java (100%) rename {EntityCulling-Fabric/src => src}/main/java/dev/tr7zw/entityculling/EntityCullingMod.java (100%) rename {Shared/src => src}/main/java/dev/tr7zw/entityculling/EntityCullingModBase.java (100%) rename {Shared/src => src}/main/java/dev/tr7zw/entityculling/Provider.java (100%) rename {Shared/src => src}/main/java/dev/tr7zw/entityculling/access/EntityRendererInter.java (93%) rename {Shared/src => src}/main/java/dev/tr7zw/entityculling/mixin/BlockEntityRenderDispatcherMixin.java (100%) rename {Shared/src => src}/main/java/dev/tr7zw/entityculling/mixin/ClientWorldMixin.java (100%) rename {Shared/src => src}/main/java/dev/tr7zw/entityculling/mixin/CullableMixin.java (100%) rename {Shared/src => src}/main/java/dev/tr7zw/entityculling/mixin/DebugHudMixin.java (100%) rename {Shared/src => src}/main/java/dev/tr7zw/entityculling/mixin/EntityRendererMixin.java (86%) rename {Shared/src => src}/main/java/dev/tr7zw/entityculling/mixin/WorldRendererMixin.java (98%) rename {Shared/src => src}/main/resources/assets/entityculling/lang/en_us.json (100%) rename {Shared/src => src}/main/resources/assets/entityculling/lang/fr_fr.json (100%) rename {Shared/src => src}/main/resources/assets/entityculling/lang/it_it.json (100%) rename {Shared/src => src}/main/resources/assets/entityculling/lang/pt_br.json (100%) rename {Shared/src => src}/main/resources/assets/entityculling/lang/ru_ru.json (100%) rename {Shared/src => src}/main/resources/assets/entityculling/lang/uk_ua.json (100%) rename {Shared/src => src}/main/resources/assets/entityculling/lang/vi_vn.json (100%) rename {Shared/src => src}/main/resources/assets/entityculling/lang/zh_tw.json (96%) rename {Shared/src => src}/main/resources/entityculling.mixins.json (100%) rename {Shared/src/main/resources/assets/entityculling => src/main/resources}/icon.png (100%) rename {EntityCulling-Fabric/src => src}/test/java/dev/tr7zw/tests/MixinTests.java (100%) create mode 100644 versions/mainProject diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb031d5..fcb8806 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -10,34 +10,32 @@ jobs: steps: - name: checkout repository uses: actions/checkout@v2 - - name: setup jdk 17 - uses: actions/setup-java@v1 + - name: setup jdk 21 + uses: actions/setup-java@v4 with: - java-version: 17 + distribution: temurin + java-version: 21 # to cache gradle files - name: Setup Gradle - uses: gradle/gradle-build-action@v2 + uses: gradle/actions/setup-gradle@v3 with: - cache-read-only: false gradle-home-cache-cleanup: true - - name: make gradle wrapper executable - if: ${{ runner.os != 'Windows' }} - run: chmod +x ./gradlecw + dependency-graph: generate-and-submit +# Already needs to be executable, so the dirty check is correct +# - name: make gradle wrapper executable +# if: ${{ runner.os != 'Windows' }} +# run: chmod +x ./gradlecw - name: build run: ./gradlecw build - name: capture build artifacts uses: actions/upload-artifact@v2 with: name: Artifacts - path: | - EntityCulling-Fabric/build/libs/* - EntityCulling-Forge/build/libs/* - EntityCulling-Neo/build/libs/* - EntityCulling-Versionless/build/libs/* - - name: Test Report - uses: dorny/test-reporter@v1 - if: success() || failure() - with: - name: JUnit Tests - path: '**/build/test-results/test/TEST-*.xml' - reporter: java-junit \ No newline at end of file + path: 'versions/**/build/libs/*.jar' +# - name: Test Report +# uses: dorny/test-reporter@v1 +# if: success() || failure() +# with: +# name: JUnit Tests +# path: '**/build/test-results/test/TEST-*.xml' +# reporter: java-junit \ No newline at end of file diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml index 8037700..05b4623 100644 --- a/.github/workflows/tag.yml +++ b/.github/workflows/tag.yml @@ -8,10 +8,10 @@ jobs: steps: - name: checkout repository uses: actions/checkout@v2 - - name: setup jdk 17 + - name: setup jdk 21 uses: actions/setup-java@v1 with: - java-version: 17 + java-version: 21 - name: make gradle wrapper executable run: chmod +x ./gradlecw - name: build @@ -19,57 +19,22 @@ jobs: - name: Release uses: softprops/action-gh-release@v1 with: - files: | - EntityCulling-Fabric/build/libs/* - EntityCulling-Forge/build/libs/* - EntityCulling-Neo/build/libs/* - EntityCulling-Versionless/build/libs/* - - name: Publish-Neo-Curseforge + files: 'versions/**/build/libs/!(*-@(dev|sources|javadoc|all)).jar' + - name: Publish-1.20.5-fabric-Curseforge uses: Kir-Antipov/mc-publish@v3.3.0 with: curseforge-id: 448233 - curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} - loaders: neoforge - name: ${{github.ref_name}} - NeoForge - version-type: beta - files: '*Neo/build/libs/!(*-@(dev|sources|javadoc|all)).jar' - game-versions: 1.20.4 - - name: Publish-Neo-Modrinth - uses: Kir-Antipov/mc-publish@v3.3.0 - with: - modrinth-id: NNAgCjsB - modrinth-token: ${{ secrets.MODRINTH_TOKEN }} - loaders: neoforge - name: ${{github.ref_name}} - NeoForge - files: '*Neo/build/libs/!(*-@(dev|sources|javadoc|all)).jar' - game-versions: 1.20.4 - - name: Publish-Forge-Curseforge - uses: Kir-Antipov/mc-publish@v3.3.0 - with: - curseforge-id: 448233 - curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} - loaders: forge - name: ${{github.ref_name}} - Forge - version-type: beta - files: '*Forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar' - game-versions: 1.20.4 - - name: Publish-Forge-Modrinth - uses: Kir-Antipov/mc-publish@v3.3.0 - with: - modrinth-id: NNAgCjsB - modrinth-token: ${{ secrets.MODRINTH_TOKEN }} - loaders: forge - name: ${{github.ref_name}} - Forge - files: '*Forge/build/libs/!(*-@(dev|sources|javadoc|all)).jar' - game-versions: 1.20.4 - - name: Publish-Fabric + curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} + loaders: fabric + name: ${{github.ref_name}}-1.20.5 - Fabric + files: 'versions/1.20.5-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar' + game-versions: 1.20.5 + - name: Publish-1.20.5-fabric-Modrinth uses: Kir-Antipov/mc-publish@v3.3.0 with: modrinth-id: NNAgCjsB modrinth-token: ${{ secrets.MODRINTH_TOKEN }} - curseforge-id: 448233 - curseforge-token: ${{ secrets.CURSEFORGE_TOKEN }} loaders: fabric - name: ${{github.ref_name}} - Fabric - files: '*Fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar' - game-versions: 1.20.4 + name: ${{github.ref_name}}-1.20.5 - Fabric + files: 'versions/1.20.5-fabric/build/libs/!(*-@(dev|sources|javadoc|all)).jar' + game-versions: 1.20.5 diff --git a/.gitignore b/.gitignore index dfa27ff..ab0ad04 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,11 @@ gradle/wrapper VersionShared UtilityCode formatter.xml +src/main/fabric-resources/fabric.mod.json +src/main/forge-resources/META-INF/mods.toml +src/main/neoforge-resources/META-INF/mods.toml +**/src/main/java/dev/tr7zw/config/CustomConfigScreen.java +**/src/main/java/dev/tr7zw/util/ComponentProvider.java +src/main/resources/pack.mcmeta +src/main/java/dev/tr7zw/util/ModLoaderUtil.java +src/main/java/dev/tr7zw/util/NMSHelper.java diff --git a/EntityCulling-Fabric/src/main/resources/fabric.mod.json b/EntityCulling-Fabric/src/main/resources/fabric.mod.json deleted file mode 100644 index f70257b..0000000 --- a/EntityCulling-Fabric/src/main/resources/fabric.mod.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "schemaVersion": 1, - "id": "${mod_id}", - "version": "${version}", - "name": "${mod_name}", - "description": "${description}", - "authors": [ - "${mod_author}" - ], - "contact": { - "homepage": "${homepage_url}", - "sources": "${sources_url}", - "issues": "${issues_url}" - }, - "license": "${license_name}", - "icon": "assets/${mod_id}/icon.png", - "environment": "CLIENT", - "entrypoints": { - "client": [ - "dev.tr7zw.entityculling.EntityCullingMod" - ] - }, - "mixins": [ - "${mod_id}.mixins.json" - ], - "depends": { - "minecraft": "${minecraft_version_range_fabric}" - } -} diff --git a/gradle-compose.yml b/gradle-compose.yml index 7db3773..9719e84 100644 --- a/gradle-compose.yml +++ b/gradle-compose.yml @@ -1,5 +1,5 @@ version: '0.0.2' -source: "https://github.com/tr7zw/ModComposeTemplate/tree/1.20.4" +source: "https://github.com/tr7zw/ProcessedModTemplate/tree/master" replacements: name: "EntityCulling" id: "entityculling" @@ -8,15 +8,16 @@ replacements: homepageUrl: "https://modrinth.com/mod/entityculling" sourcesUrl: "https://github.com/tr7zw/EntityCulling" issuesUrl: "https://github.com/tr7zw/EntityCulling/issues" + fabric_entrypoint: "dev.tr7zw.entityculling.EntityCullingMod" + fabric_modmenu_entrypoint: "none" relocationpackage: "dev.tr7zw.entityculling" dependencies: ' inc "com.logisticscraft:occlusionculling:0.0.8-SNAPSHOT" - - inc project(":EntityCulling-Versionless") ' licensename: "LICENSE-EntityCulling" modrinthid: NNAgCjsB curseforgeid: 448233 + versionlessname: "EntityCulling-Versionless" enabledFlags: - autopublish - publishFabric @@ -24,35 +25,10 @@ enabledFlags: - publishNeo - modrinth - curseforge + - versionless rootProject: template: "." subProjects: - EntityCulling-Fabric: - template: "Fabric" - EntityCulling-Forge: - template: "Forge" - replacements: - dependencies: ' - inc "com.logisticscraft:occlusionculling:0.0.8-SNAPSHOT" - - forgeRuntimeLibrary "com.logisticscraft:occlusionculling:0.0.8-SNAPSHOT" - - inc project(":EntityCulling-Versionless") - - forgeRuntimeLibrary project(":EntityCulling-Versionless") - ' - EntityCulling-Neo: - template: "Neo" - replacements: - dependencies: ' - inc "com.logisticscraft:occlusionculling:0.0.8-SNAPSHOT" - - forgeRuntimeLibrary "com.logisticscraft:occlusionculling:0.0.8-SNAPSHOT" - - inc project(":EntityCulling-Versionless") - - forgeRuntimeLibrary project(":EntityCulling-Versionless") - ' EntityCulling-Versionless: template: "Versionless" replacements: diff --git a/gradle/gradle-compose.jar b/gradle/gradle-compose.jar index 8242f8a9b849e985ee9c5f9f133b6428fb3ed766..4f20b7769b8a89462e8450945070cc9f06043b8f 100644 GIT binary patch delta 5890 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 delta 4372 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 { boolean shadowShouldShowName(T entity); void shadowRenderNameTag(T entity, Component component, PoseStack poseStack, MultiBufferSource multiBufferSource, - int light); + int light, float f); } \ No newline at end of file diff --git a/Shared/src/main/java/dev/tr7zw/entityculling/mixin/BlockEntityRenderDispatcherMixin.java b/src/main/java/dev/tr7zw/entityculling/mixin/BlockEntityRenderDispatcherMixin.java similarity index 100% rename from Shared/src/main/java/dev/tr7zw/entityculling/mixin/BlockEntityRenderDispatcherMixin.java rename to src/main/java/dev/tr7zw/entityculling/mixin/BlockEntityRenderDispatcherMixin.java diff --git a/Shared/src/main/java/dev/tr7zw/entityculling/mixin/ClientWorldMixin.java b/src/main/java/dev/tr7zw/entityculling/mixin/ClientWorldMixin.java similarity index 100% rename from Shared/src/main/java/dev/tr7zw/entityculling/mixin/ClientWorldMixin.java rename to src/main/java/dev/tr7zw/entityculling/mixin/ClientWorldMixin.java diff --git a/Shared/src/main/java/dev/tr7zw/entityculling/mixin/CullableMixin.java b/src/main/java/dev/tr7zw/entityculling/mixin/CullableMixin.java similarity index 100% rename from Shared/src/main/java/dev/tr7zw/entityculling/mixin/CullableMixin.java rename to src/main/java/dev/tr7zw/entityculling/mixin/CullableMixin.java diff --git a/Shared/src/main/java/dev/tr7zw/entityculling/mixin/DebugHudMixin.java b/src/main/java/dev/tr7zw/entityculling/mixin/DebugHudMixin.java similarity index 100% rename from Shared/src/main/java/dev/tr7zw/entityculling/mixin/DebugHudMixin.java rename to src/main/java/dev/tr7zw/entityculling/mixin/DebugHudMixin.java diff --git a/Shared/src/main/java/dev/tr7zw/entityculling/mixin/EntityRendererMixin.java b/src/main/java/dev/tr7zw/entityculling/mixin/EntityRendererMixin.java similarity index 86% rename from Shared/src/main/java/dev/tr7zw/entityculling/mixin/EntityRendererMixin.java rename to src/main/java/dev/tr7zw/entityculling/mixin/EntityRendererMixin.java index 058c097..4387a9a 100644 --- a/Shared/src/main/java/dev/tr7zw/entityculling/mixin/EntityRendererMixin.java +++ b/src/main/java/dev/tr7zw/entityculling/mixin/EntityRendererMixin.java @@ -21,8 +21,8 @@ public boolean shadowShouldShowName(T entity) { @Override public void shadowRenderNameTag(T entity, Component component, PoseStack poseStack, - MultiBufferSource multiBufferSource, int light) { - renderNameTag(entity, component, poseStack, multiBufferSource, light); + MultiBufferSource multiBufferSource, int light, float f) { + renderNameTag(entity, component, poseStack, multiBufferSource, light, f); } @Shadow @@ -30,6 +30,6 @@ public void shadowRenderNameTag(T entity, Component component, PoseStack poseSta @Shadow public abstract void renderNameTag(T entity, Component component, PoseStack poseStack, - MultiBufferSource multiBufferSource, int i); + MultiBufferSource multiBufferSource, int i, float f); } diff --git a/Shared/src/main/java/dev/tr7zw/entityculling/mixin/WorldRendererMixin.java b/src/main/java/dev/tr7zw/entityculling/mixin/WorldRendererMixin.java similarity index 98% rename from Shared/src/main/java/dev/tr7zw/entityculling/mixin/WorldRendererMixin.java rename to src/main/java/dev/tr7zw/entityculling/mixin/WorldRendererMixin.java index 3029603..0598e89 100644 --- a/Shared/src/main/java/dev/tr7zw/entityculling/mixin/WorldRendererMixin.java +++ b/src/main/java/dev/tr7zw/entityculling/mixin/WorldRendererMixin.java @@ -49,7 +49,7 @@ private void renderEntity(Entity entity, double cameraX, double cameraY, double matrices.pushPose(); matrices.translate(d, e, f); entityRendererInter.shadowRenderNameTag(entity, entity.getDisplayName(), matrices, vertexConsumers, - this.entityRenderDispatcher.getPackedLightCoords(entity, tickDelta)); + this.entityRenderDispatcher.getPackedLightCoords(entity, tickDelta), tickDelta); matrices.popPose(); } EntityCullingModBase.instance.skippedEntities++; diff --git a/Shared/src/main/resources/assets/entityculling/lang/en_us.json b/src/main/resources/assets/entityculling/lang/en_us.json similarity index 100% rename from Shared/src/main/resources/assets/entityculling/lang/en_us.json rename to src/main/resources/assets/entityculling/lang/en_us.json diff --git a/Shared/src/main/resources/assets/entityculling/lang/fr_fr.json b/src/main/resources/assets/entityculling/lang/fr_fr.json similarity index 100% rename from Shared/src/main/resources/assets/entityculling/lang/fr_fr.json rename to src/main/resources/assets/entityculling/lang/fr_fr.json diff --git a/Shared/src/main/resources/assets/entityculling/lang/it_it.json b/src/main/resources/assets/entityculling/lang/it_it.json similarity index 100% rename from Shared/src/main/resources/assets/entityculling/lang/it_it.json rename to src/main/resources/assets/entityculling/lang/it_it.json diff --git a/Shared/src/main/resources/assets/entityculling/lang/pt_br.json b/src/main/resources/assets/entityculling/lang/pt_br.json similarity index 100% rename from Shared/src/main/resources/assets/entityculling/lang/pt_br.json rename to src/main/resources/assets/entityculling/lang/pt_br.json diff --git a/Shared/src/main/resources/assets/entityculling/lang/ru_ru.json b/src/main/resources/assets/entityculling/lang/ru_ru.json similarity index 100% rename from Shared/src/main/resources/assets/entityculling/lang/ru_ru.json rename to src/main/resources/assets/entityculling/lang/ru_ru.json diff --git a/Shared/src/main/resources/assets/entityculling/lang/uk_ua.json b/src/main/resources/assets/entityculling/lang/uk_ua.json similarity index 100% rename from Shared/src/main/resources/assets/entityculling/lang/uk_ua.json rename to src/main/resources/assets/entityculling/lang/uk_ua.json diff --git a/Shared/src/main/resources/assets/entityculling/lang/vi_vn.json b/src/main/resources/assets/entityculling/lang/vi_vn.json similarity index 100% rename from Shared/src/main/resources/assets/entityculling/lang/vi_vn.json rename to src/main/resources/assets/entityculling/lang/vi_vn.json diff --git a/Shared/src/main/resources/assets/entityculling/lang/zh_tw.json b/src/main/resources/assets/entityculling/lang/zh_tw.json similarity index 96% rename from Shared/src/main/resources/assets/entityculling/lang/zh_tw.json rename to src/main/resources/assets/entityculling/lang/zh_tw.json index e797f3f..1e68e4e 100644 --- a/Shared/src/main/resources/assets/entityculling/lang/zh_tw.json +++ b/src/main/resources/assets/entityculling/lang/zh_tw.json @@ -1,4 +1,4 @@ -{ - "text.entityculling.title": "EntityCulling", - "key.entityculling.toggle": "開關剔除除錯" -} +{ + "text.entityculling.title": "EntityCulling", + "key.entityculling.toggle": "開關剔除除錯" +} diff --git a/Shared/src/main/resources/entityculling.mixins.json b/src/main/resources/entityculling.mixins.json similarity index 100% rename from Shared/src/main/resources/entityculling.mixins.json rename to src/main/resources/entityculling.mixins.json diff --git a/Shared/src/main/resources/assets/entityculling/icon.png b/src/main/resources/icon.png similarity index 100% rename from Shared/src/main/resources/assets/entityculling/icon.png rename to src/main/resources/icon.png diff --git a/EntityCulling-Fabric/src/test/java/dev/tr7zw/tests/MixinTests.java b/src/test/java/dev/tr7zw/tests/MixinTests.java similarity index 100% rename from EntityCulling-Fabric/src/test/java/dev/tr7zw/tests/MixinTests.java rename to src/test/java/dev/tr7zw/tests/MixinTests.java diff --git a/versions/mainProject b/versions/mainProject new file mode 100644 index 0000000..1b98e10 --- /dev/null +++ b/versions/mainProject @@ -0,0 +1 @@ +1.20.5-fabric \ No newline at end of file