diff --git a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java index 5d8f71025..99c98fe96 100644 --- a/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java +++ b/src/main/java/com/gtnewhorizons/angelica/config/AngelicaConfig.java @@ -148,4 +148,9 @@ public class AngelicaConfig { @Config.RangeInt(min = 64, max = 1024) public static int itemRendererDisplayListCacheSize; + @Config.Comment("Render distance for the spinning mob inside mod spawners") + @Config.DefaultDouble(16D) + @Config.RangeDouble(min = 16D, max = 64D) + public static double mobSpawnerRenderDistance; + } diff --git a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java index 1f35323a3..2d746fd1e 100644 --- a/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java +++ b/src/main/java/com/gtnewhorizons/angelica/mixins/Mixins.java @@ -137,6 +137,7 @@ public enum Mixins { ,"sodium.MixinRenderGlobal" ,"sodium.MixinWorldClient" ,"sodium.MixinTileEntity" + ,"sodium.MixinTileEntityMobSpawner" ,"sodium.MixinEffectRenderer" ,"sodium.MixinTileEntityRendererDispatcher" ,"sodium.MixinLongHashMap" diff --git a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java index a0b7f13dd..241b865de 100644 --- a/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java +++ b/src/main/java/me/jellysquid/mods/sodium/client/gui/SodiumGameOptionPages.java @@ -164,6 +164,15 @@ public class SodiumGameOptionPages { .setImpact(OptionImpact.MEDIUM) .build() ) + .add( + OptionImpl.createBuilder(int.class, angelicaOpts) + .setName(I18n.format("options.angelica.mobSpawnerRenderDistance")) + .setTooltip(I18n.format("options.angelica.mobSpawnerRenderDistance.tooltip")) + .setControl(option -> new SliderControl(option, 16, 64, 1, ControlValueFormatter.number())) + .setBinding((options, value) -> AngelicaConfig.mobSpawnerRenderDistance = value, options -> (int) AngelicaConfig.mobSpawnerRenderDistance) + .setImpact(OptionImpact.MEDIUM) + .build() + ) .build()); return new OptionPage(I18n.format("stat.generalButton"), ImmutableList.copyOf(groups)); @@ -178,8 +187,10 @@ public class SodiumGameOptionPages { .setTooltip(I18n.format("sodium.options.graphics_quality.tooltip")) .setControl(option -> new CyclingControl<>(option, GraphicsMode.class)) .setBinding( - (opts, value) -> { opts.fancyGraphics = value.isFancy(); - SettingsManager.graphicsUpdated(); }, + (opts, value) -> { + opts.fancyGraphics = value.isFancy(); + SettingsManager.graphicsUpdated(); + }, opts -> GraphicsMode.fromBoolean(opts.fancyGraphics)) .setImpact(OptionImpact.HIGH) .setFlags(OptionFlag.REQUIRES_RENDERER_RELOAD) diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index 6739e072e..e8e67d0fd 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -137,6 +137,8 @@ options.dynamic_lights_shader_force=Dynamic Lights - Forced With Shaders options.dynamic_lights_shader_force.tooltip=Enabled - Dynamic Lights are shown even when a shader is active, Disabled - Dynamic Lights are disabled when a shader is active. options.angelica.droppedItemLimit=Dropped Item Render Limit options.angelica.droppedItemLimit.tooltip=The maximum number of dropped items that will be rendered. Lower values can improve performance. +options.angelica.mobSpawnerRenderDistance=Mod spawner render distance +options.angelica.mobSpawnerRenderDistance.tooltip=Render distance for the spinning mob inside mod spawners options.angelica.itemdisplaylistcount=Item Renderer Display List Cache Size options.angelica.itemdisplaylistcount.tooltip=The maximum number of display lists to cache in the optimized item renderer. Higher values will increase performance but increase VRAM usage. pack.iris.select.title=Select diff --git a/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinTileEntityMobSpawner.java b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinTileEntityMobSpawner.java new file mode 100644 index 000000000..5f2c5cea7 --- /dev/null +++ b/src/mixin/java/com/gtnewhorizons/angelica/mixins/early/sodium/MixinTileEntityMobSpawner.java @@ -0,0 +1,17 @@ +package com.gtnewhorizons.angelica.mixins.early.sodium; + +import com.gtnewhorizons.angelica.config.AngelicaConfig; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.tileentity.TileEntityMobSpawner; +import org.spongepowered.asm.mixin.Mixin; + +@Mixin(TileEntityMobSpawner.class) +public class MixinTileEntityMobSpawner extends TileEntity { + + @Override + public double getMaxRenderDistanceSquared() { + final double d = AngelicaConfig.mobSpawnerRenderDistance; + return d * d; + } + +}