Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature: Hide Far Entities #1064

Merged
merged 20 commits into from
Apr 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt
Original file line number Diff line number Diff line change
Expand Up @@ -309,6 +309,7 @@ import at.hannibal2.skyhanni.features.misc.ExpOrbsOnGroundHider
import at.hannibal2.skyhanni.features.misc.FixGhostEntities
import at.hannibal2.skyhanni.features.misc.FixNEUHeavyPearls
import at.hannibal2.skyhanni.features.misc.HideArmor
import at.hannibal2.skyhanni.features.misc.HideFarEntities
import at.hannibal2.skyhanni.features.misc.InGameDateDisplay
import at.hannibal2.skyhanni.features.misc.JoinCrystalHollows
import at.hannibal2.skyhanni.features.misc.LesserOrbHider
Expand Down Expand Up @@ -575,6 +576,7 @@ class SkyHanniMod {
loadModule(HideNotClickableItems())
loadModule(ItemDisplayOverlayFeatures)
loadModule(CurrentPetDisplay())
loadModule(HideFarEntities())
loadModule(ExpOrbsOnGroundHider())
loadModule(BetterWikiFromMenus())
loadModule(DamageIndicatorManager())
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package at.hannibal2.skyhanni.config.features.misc;

import at.hannibal2.skyhanni.config.FeatureToggle;
import com.google.gson.annotations.Expose;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean;
import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider;
import io.github.notenoughupdates.moulconfig.annotations.ConfigOption;

public class HideFarEntitiesConfig {
@Expose
@ConfigOption(name = "Enabled", desc = "Hide all entities from rendering except the nearest ones.")
@ConfigEditorBoolean
@FeatureToggle
public boolean enabled = false;

@Expose
@ConfigOption(name = "Min Distance", desc = "Always shows mobs that are at least that close to the player.")
@ConfigEditorSlider(minValue = 3, maxValue = 30, minStep = 1)
public int minDistance = 10;

@Expose
@ConfigOption(name = "Max Amount", desc = "Not showing more than this amount of nearest entities.")
@ConfigEditorSlider(minValue = 1, maxValue = 150, minStep = 1)
public int maxAmount = 30;

@Expose
@ConfigOption(name = "Exclude Garden", desc = "Disable this feature while in the Garden.")
@ConfigEditorBoolean
public boolean excludeGarden = false;
}
Original file line number Diff line number Diff line change
Expand Up @@ -251,4 +251,9 @@ public class MiscConfig {
@ConfigEditorBoolean
@FeatureToggle
public boolean fixGhostEntities = true;

@ConfigOption(name = "Hide Far Entities", desc = "")
@Accordion
@Expose
public HideFarEntitiesConfig hideFarEntities = new HideFarEntitiesConfig();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package at.hannibal2.skyhanni.features.misc

import at.hannibal2.skyhanni.SkyHanniMod
import at.hannibal2.skyhanni.events.CheckRenderEntityEvent
import at.hannibal2.skyhanni.events.LorenzTickEvent
import at.hannibal2.skyhanni.features.garden.GardenAPI
import at.hannibal2.skyhanni.utils.EntityUtils
import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer
import at.hannibal2.skyhanni.utils.LorenzUtils
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent

class HideFarEntities {
private val config get() = SkyHanniMod.feature.misc.hideFarEntities

private var ignored = emptySet<Int>()

@SubscribeEvent
fun onTick(event: LorenzTickEvent) {
if (!isEnabled()) return

val maxAmount = config.maxAmount.coerceAtLeast(1)
val minDistance = config.minDistance.coerceAtLeast(3)

ignored = EntityUtils.getAllEntities()
.map { it.entityId to it.distanceToPlayer() }
.filter { it.second > minDistance }
.sortedBy { it.second }.drop(maxAmount)
.map { it.first }.toSet()
}

@SubscribeEvent
fun onCheckRender(event: CheckRenderEntityEvent<*>) {
if (isEnabled() && event.entity.entityId in ignored) {
event.cancel()
}
}

fun isEnabled() = LorenzUtils.inSkyBlock && config.enabled && !(GardenAPI.inGarden() && config.excludeGarden)
}
Loading