From b6a8fed850d30d2a082a9ad41d61e8cfae4e2d40 Mon Sep 17 00:00:00 2001 From: Spottedleaf <Spottedleaf@users.noreply.github.com> Date: Wed, 29 May 2024 01:35:45 -0700 Subject: [PATCH] Add conformVisibility for mixin overwrites We don't actually want to change the visibility of mixins when overwriting them. This reduces the surface area for mod conflicts. --- .../moonrise/mixin/starlight/world/WorldGenRegionMixin.java | 4 ++-- src/main/resources/moonrise.mixins.json | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/ca/spottedleaf/moonrise/mixin/starlight/world/WorldGenRegionMixin.java b/src/main/java/ca/spottedleaf/moonrise/mixin/starlight/world/WorldGenRegionMixin.java index 11c53b35..e9b2195b 100644 --- a/src/main/java/ca/spottedleaf/moonrise/mixin/starlight/world/WorldGenRegionMixin.java +++ b/src/main/java/ca/spottedleaf/moonrise/mixin/starlight/world/WorldGenRegionMixin.java @@ -15,7 +15,7 @@ public abstract class WorldGenRegionMixin implements WorldGenLevel { public abstract ChunkAccess getChunk(int i, int j); /** - * @reason During feature generation, light data is not initialised and will always return 15 in Starlight. Vanilla + * During feature generation, light data is not initialised and will always return 15 in Starlight. Vanilla * can possibly return 0 if partially initialised, which allows some mushroom blocks to generate. * In general, the brightness value from the light engine should not be used until the chunk is ready. To emulate * Vanilla behavior better, we return 0 as the brightness during world gen unless the target chunk is finished @@ -32,7 +32,7 @@ public int getBrightness(final LightLayer lightLayer, final BlockPos blockPos) { } /** - * @reason See above + * See above * @author Spottedleaf */ @Override diff --git a/src/main/resources/moonrise.mixins.json b/src/main/resources/moonrise.mixins.json index 538a5ed2..e1a8aae6 100644 --- a/src/main/resources/moonrise.mixins.json +++ b/src/main/resources/moonrise.mixins.json @@ -106,5 +106,8 @@ ], "injectors": { "defaultRequire": 1 - } + }, + "overwrites": { + "conformVisibility": true + } }