replace most access wideners with mixins

2026-04-11 10:16:15 +00:00 · 2021-05-03 19:33:57 -07:00
parent 756f04a0b3
commit 457729b832
9 changed files with 84 additions and 36 deletions
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/TerraFabricPlugin.java
@@ -39,7 +39,8 @@ import com.dfsek.terra.config.pack.ConfigPack;
 import com.dfsek.terra.config.templates.BiomeTemplate;
 import com.dfsek.terra.fabric.handle.FabricItemHandle;
 import com.dfsek.terra.fabric.handle.FabricWorldHandle;
-import com.dfsek.terra.fabric.mixin.GeneratorTypeAccessor;
+import com.dfsek.terra.fabric.mixin.access.BiomeEffectsAccessor;
+import com.dfsek.terra.fabric.mixin.access.GeneratorTypeAccessor;
 import com.dfsek.terra.fabric.world.TerraBiomeSource;
 import com.dfsek.terra.fabric.world.features.PopulatorFeature;
 import com.dfsek.terra.fabric.world.generator.FabricChunkGeneratorWrapper;
@@ -259,23 +260,23 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
        generationSettings.feature(GenerationStep.Feature.VEGETAL_DECORATION, POPULATOR_CONFIGURED_FEATURE);


+        BiomeEffectsAccessor accessor = (BiomeEffectsAccessor) vanilla.getEffects();
        BiomeEffects.Builder effects = new BiomeEffects.Builder()
-                .waterColor(colors.getOrDefault("water", vanilla.getEffects().waterColor))
-                .waterFogColor(colors.getOrDefault("water-fog", vanilla.getEffects().waterFogColor))
-                .fogColor(colors.getOrDefault("fog", vanilla.getEffects().fogColor))
-                .skyColor(colors.getOrDefault("sky", vanilla.getEffects().skyColor))
-                .grassColorModifier(vanilla.getEffects().grassColorModifier);
+                .waterColor(colors.getOrDefault("water", accessor.getWaterColor()))
+                .waterFogColor(colors.getOrDefault("water-fog", accessor.getWaterFogColor()))
+                .fogColor(colors.getOrDefault("fog", accessor.getFogColor()))
+                .skyColor(colors.getOrDefault("sky", accessor.getSkyColor()))
+                .grassColorModifier(accessor.getGrassColorModifier());

        if(colors.containsKey("grass")) {
            effects.grassColor(colors.get("grass"));
        } else {
-            vanilla.getEffects().grassColor.ifPresent(effects::grassColor);
+            accessor.getGrassColor().ifPresent(effects::grassColor);
        }
-        vanilla.getEffects().foliageColor.ifPresent(effects::foliageColor);
        if(colors.containsKey("foliage")) {
            effects.foliageColor(colors.get("foliage"));
        } else {
-            vanilla.getEffects().foliageColor.ifPresent(effects::foliageColor);
+            accessor.getFoliageColor().ifPresent(effects::foliageColor);
        }

        return new Biome.Builder()
@@ -328,7 +329,7 @@ public class TerraFabricPlugin implements TerraPlugin, ModInitializer {
                };
                //noinspection ConstantConditions
                ((GeneratorTypeAccessor) generatorType).setTranslationKey(new LiteralText("Terra:" + pack.getTemplate().getID()));
-                GeneratorTypeAccessor.getVALUES().add(generatorType);
+                GeneratorTypeAccessor.getValues().add(generatorType);
            });
        }

--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/BiomeEffectsAccessor.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/BiomeEffectsAccessor.java
@@ -0,0 +1,31 @@
+package com.dfsek.terra.fabric.mixin.access;
+
+import net.minecraft.world.biome.BiomeEffects;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Optional;
+
+@Mixin(BiomeEffects.class)
+public interface BiomeEffectsAccessor {
+    @Accessor("fogColor")
+    int getFogColor();
+
+    @Accessor("waterColor")
+    int getWaterColor();
+
+    @Accessor("waterFogColor")
+    int getWaterFogColor();
+
+    @Accessor("skyColor")
+    int getSkyColor();
+
+    @Accessor("foliageColor")
+    Optional<Integer> getFoliageColor();
+
+    @Accessor("grassColor")
+    Optional<Integer> getGrassColor();
+
+    @Accessor("grassColorModifier")
+    BiomeEffects.GrassColorModifier getGrassColorModifier();
+}
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/GeneratorTypeAccessor.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/GeneratorTypeAccessor.java
@@ -1,4 +1,4 @@
-package com.dfsek.terra.fabric.mixin;
+package com.dfsek.terra.fabric.mixin.access;

 import net.minecraft.client.world.GeneratorType;
 import net.minecraft.text.Text;
@@ -10,12 +10,12 @@ import java.util.List;

@Mixin(GeneratorType.class)
 public interface GeneratorTypeAccessor {
-    @Accessor
-    static List<GeneratorType> getVALUES() {
+    @Accessor("VALUES")
+    static List<GeneratorType> getValues() {
        throw new UnsupportedOperationException();
    }

    @Mutable
-    @Accessor
+    @Accessor("translationKey")
    void setTranslationKey(Text translationKey);
 }
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/MobSpawnerLogicAccessor.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/MobSpawnerLogicAccessor.java
@@ -0,0 +1,12 @@
+package com.dfsek.terra.fabric.mixin.access;
+
+import net.minecraft.util.Identifier;
+import net.minecraft.world.MobSpawnerLogic;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(MobSpawnerLogic.class)
+public interface MobSpawnerLogicAccessor {
+    @Invoker("getEntityId")
+    Identifier callGetEntityId();
+}
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/StateAccessor.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/access/StateAccessor.java
@@ -0,0 +1,17 @@
+package com.dfsek.terra.fabric.mixin.access;
+
+import net.minecraft.state.State;
+import net.minecraft.state.property.Property;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+import java.util.function.Function;
+
+@Mixin(State.class)
+public interface StateAccessor {
+    @Accessor("PROPERTY_MAP_PRINTER")
+    static Function<Map.Entry<Property<?>, Comparable<?>>, String> getPropertyMapPrinter() {
+        throw new UnsupportedOperationException();
+    }
+}
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/MobSpawnerBlockEntityMixin.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/mixin/implementations/block/state/MobSpawnerBlockEntityMixin.java
@@ -4,6 +4,7 @@ import com.dfsek.terra.api.platform.block.state.MobSpawner;
 import com.dfsek.terra.api.platform.block.state.SerialState;
 import com.dfsek.terra.api.platform.entity.EntityType;
 import com.dfsek.terra.fabric.TerraFabricPlugin;
+import com.dfsek.terra.fabric.mixin.access.MobSpawnerLogicAccessor;
 import net.minecraft.block.entity.MobSpawnerBlockEntity;
 import net.minecraft.util.registry.Registry;
 import net.minecraft.world.MobSpawnerLogic;
@@ -20,7 +21,7 @@ public abstract class MobSpawnerBlockEntityMixin {
    public abstract MobSpawnerLogic getLogic();

    public EntityType terra$getSpawnedType() {
-        return (EntityType) Registry.ENTITY_TYPE.get(getLogic().getEntityId());
+        return (EntityType) Registry.ENTITY_TYPE.get(((MobSpawnerLogicAccessor) getLogic()).callGetEntityId());
    }

    public void terra$setSpawnedType(@NotNull EntityType creatureType) {
--- a/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlockData.java
+++ b/platforms/fabric/src/main/java/com/dfsek/terra/fabric/world/block/FabricBlockData.java
@@ -2,10 +2,9 @@ package com.dfsek.terra.fabric.world.block;

 import com.dfsek.terra.api.platform.block.BlockData;
 import com.dfsek.terra.api.platform.block.BlockType;
-import com.dfsek.terra.fabric.world.FabricAdapter;
+import com.dfsek.terra.fabric.mixin.access.StateAccessor;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.state.State;
 import net.minecraft.util.registry.Registry;

 import java.util.stream.Collectors;
@@ -41,7 +40,7 @@ public class FabricBlockData implements BlockData {
        StringBuilder data = new StringBuilder(Registry.BLOCK.getId(delegate.getBlock()).toString());
        if(!delegate.getEntries().isEmpty()) {
            data.append('[');
-            data.append(delegate.getEntries().entrySet().stream().map(State.PROPERTY_MAP_PRINTER).collect(Collectors.joining(",")));
+            data.append(delegate.getEntries().entrySet().stream().map(StateAccessor.getPropertyMapPrinter()).collect(Collectors.joining(",")));
            data.append(']');
        }
        return data.toString();
--- a/platforms/fabric/src/main/resources/terra.accesswidener
+++ b/platforms/fabric/src/main/resources/terra.accesswidener
@@ -1,19 +1,3 @@
 accessWidener v1 named

-extendable method net/minecraft/client/world/GeneratorType <init> (Ljava/lang/String;)V
-
-accessible field net/minecraft/server/world/ServerWorld worldProperties Lnet/minecraft/world/level/ServerWorldProperties;
-
-accessible method net/minecraft/world/MobSpawnerLogic getEntityId ()Lnet/minecraft/util/Identifier;
-
-accessible field net/minecraft/state/State PROPERTY_MAP_PRINTER Ljava/util/function/Function;
-
-
-accessible field net/minecraft/world/biome/BiomeEffects fogColor I
-accessible field net/minecraft/world/biome/BiomeEffects waterColor I
-accessible field net/minecraft/world/biome/BiomeEffects waterFogColor I
-accessible field net/minecraft/world/biome/BiomeEffects skyColor I
-
-accessible field net/minecraft/world/biome/BiomeEffects foliageColor Ljava/util/Optional;
-accessible field net/minecraft/world/biome/BiomeEffects grassColor Ljava/util/Optional;
-accessible field net/minecraft/world/biome/BiomeEffects grassColorModifier Lnet/minecraft/world/biome/BiomeEffects$GrassColorModifier;
+extendable method net/minecraft/client/world/GeneratorType <init> (Ljava/lang/String;)V
--- a/platforms/fabric/src/main/resources/terra.mixins.json
+++ b/platforms/fabric/src/main/resources/terra.mixins.json
@@ -5,6 +5,9 @@
  "compatibilityLevel": "JAVA_8",
  "mixins": [
    "GeneratorOptionsMixin",
+    "access.BiomeEffectsAccessor",
+    "access.MobSpawnerLogicAccessor",
+    "access.StateAccessor",
    "implementations.BiomeMixin",
    "implementations.ChunkGeneratorMixin",
    "implementations.ConfiguredFeatureMixin",
@@ -30,7 +33,7 @@
    "implementations.world.ServerWorldMixin"
  ],
  "client": [
-    "GeneratorTypeAccessor"
+    "access.GeneratorTypeAccessor"
  ],
  "server": [],
  "injectors": {