From d1403b2e827bea9363df45f9065b08e9ee407b55 Mon Sep 17 00:00:00 2001 From: Su5eD Date: Thu, 6 Jul 2023 10:21:11 +0200 Subject: [PATCH] Add missing accessor mixin --- .github/workflows/build.yml | 10 +----- .../fabric/impl/client/indigo/Indigo.java | 4 +-- .../fabric/impl/client/indigo/IndigoMod.java | 31 +++++++++++++++++++ .../resources/fabric-rendering-v1.mixins.json | 1 + .../mixin/transfer/BucketItemMixin.java | 1 - gradle/ffapi-setup.gradle | 3 ++ settings.gradle | 15 +++++++++ 7 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/IndigoMod.java diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d8accb4b2..70e7df44f 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ jobs: build: strategy: matrix: - java: [17-jdk, 20-jdk] + java: [17-jdk] runs-on: ubuntu-22.04 container: image: eclipse-temurin:${{ matrix.java }} @@ -20,14 +20,6 @@ jobs: gradle-home-cache-cleanup: true gradle-home-cache-excludes: | gradle.properties - - name: Setup loom cache - uses: actions/cache@v3 - with: - path: | - ./.gradle/loom-cache/minecraftMaven - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties', 'gradle.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - name: Setup gradle.properties env: GRADLE_PROPERTIES: ${{ vars.GRADLE_PROPERTIES }} diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/Indigo.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/Indigo.java index e7dad7d8c..ebbc69d16 100644 --- a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/Indigo.java +++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/Indigo.java @@ -23,7 +23,6 @@ import java.util.Locale; import java.util.Properties; -import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.loading.FMLPaths; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +32,6 @@ import net.fabricmc.fabric.impl.client.indigo.renderer.IndigoRenderer; import net.fabricmc.fabric.impl.client.indigo.renderer.aocalc.AoConfig; -@Mod("fabric_renderer_indigo") public class Indigo { public static final boolean ALWAYS_TESSELATE_INDIGO; public static final boolean ENSURE_VERTEX_FORMAT_COMPATIBILITY; @@ -126,7 +124,7 @@ private static TriState asTriState(String property) { } } - public Indigo() { + public static void onInitializeClient() { if (IndigoMixinConfigPlugin.shouldApplyIndigo()) { LOGGER.info("[Indigo] Registering Indigo renderer!"); diff --git a/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/IndigoMod.java b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/IndigoMod.java new file mode 100644 index 000000000..2bd232165 --- /dev/null +++ b/fabric-renderer-indigo/src/client/java/net/fabricmc/fabric/impl/client/indigo/IndigoMod.java @@ -0,0 +1,31 @@ +/* + * Copyright (c) 2016, 2017, 2018, 2019 FabricMC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package net.fabricmc.fabric.impl.client.indigo; + +import net.minecraftforge.api.distmarker.Dist; +import net.minecraftforge.fml.common.Mod; +import net.minecraftforge.fml.loading.FMLLoader; + +@Mod("fabric_renderer_indigo") +public class IndigoMod { + + public IndigoMod() { + if (FMLLoader.getDist() == Dist.CLIENT) { + Indigo.onInitializeClient(); + } + } +} diff --git a/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json b/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json index 2ba222cba..22e28f8eb 100644 --- a/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json +++ b/fabric-rendering-v1/src/client/resources/fabric-rendering-v1.mixins.json @@ -10,6 +10,7 @@ "EntityModelsMixin", "EntityRenderersMixin", "DimensionEffectsAccessor", + "EntityModelLayersAccessor", "shader.ShaderProgramMixin", "shader.ShaderProgramMixin$ShaderProgramGlslProcessorMixin" ], diff --git a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BucketItemMixin.java b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BucketItemMixin.java index b5cd71d5e..43b6e64b1 100644 --- a/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BucketItemMixin.java +++ b/fabric-transfer-api-v1/src/main/java/net/fabricmc/fabric/mixin/transfer/BucketItemMixin.java @@ -46,7 +46,6 @@ public class BucketItemMixin { index = 4 ) private SoundEvent hookEmptyingSound(SoundEvent previous) { - // TODO FFAPI: Leverage forge fluid types return FluidVariantAttributes.getHandlerOrDefault(fluid).getEmptySound(FluidVariant.of(fluid)).orElse(previous); } } diff --git a/gradle/ffapi-setup.gradle b/gradle/ffapi-setup.gradle index 363258ea6..4c88a1fb2 100644 --- a/gradle/ffapi-setup.gradle +++ b/gradle/ffapi-setup.gradle @@ -364,6 +364,9 @@ abstract class GenerateForgeModMetadata extends DefaultTask { loaderVersion "[${loaderVersionString.get()},)" license json.license ?: "All Rights Reserved" if (json.environment == "client") { + displayTest "IGNORE_ALL_VERSION" + } + if (json.environment == "server") { displayTest "IGNORE_SERVER_VERSION" } diff --git a/settings.gradle b/settings.gradle index 6e3324c43..5d4e14c21 100644 --- a/settings.gradle +++ b/settings.gradle @@ -11,6 +11,21 @@ pluginManagement { } } +// FFAPI +plugins { + id("com.gradle.enterprise") version("3.13.4") +} + +gradleEnterprise { + if (System.getenv("CI") != null) { + buildScan { + publishAlways() + termsOfServiceUrl = "https://gradle.com/terms-of-service" + termsOfServiceAgree = "yes" + } + } +} + rootProject.name = "fabric-api" include 'fabric-api-base'