Skip to content

Added entity whitelist #40

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.

Sign up for GitHub

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

Open
Syrikal wants to merge 2 commits into
base: 1.16
Choose a base branch
from
Open

Added entity whitelist #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5ba5e0
Added entity whitelist
Syrikal Jan 19, 2023
bed93eb
Fixed an unnecessary newline
Syrikal Jan 19, 2023
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
5 changes: 5 additions & 0 deletions src/main/java/vice/magnesium_extras/config/MagnesiumExtrasConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@
import com.electronwill.nightconfig.core.io.WritingMode;
import lombok.val;
import me.jellysquid.mods.sodium.client.gui.options.TextProvider;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.ForgeConfigSpec;
import java.nio.file.Path;
import java.util.Collections;
import java.util.List;
import static net.minecraftforge.common.ForgeConfigSpec.ConfigValue;

public class MagnesiumExtrasConfig
Expand All @@ -24,6 +27,7 @@ public class MagnesiumExtrasConfig

public static ConfigValue<Integer> maxEntityRenderDistanceSquare;
public static ConfigValue<Integer> maxEntityRenderDistanceY;
public static ConfigValue<List<? extends String>> entityWhitelist;

public static ConfigValue<Boolean> fog;
public static ConfigValue<Boolean> enableDistanceChecks;
Expand Down Expand Up @@ -86,6 +90,7 @@ public class MagnesiumExtrasConfig

maxEntityRenderDistanceSquare = b.define("(Entity) Max Horizontal Render Distance [Squared, Default 64^2]", 4096);
maxEntityRenderDistanceY = b.define("(Entity) Max Vertical Render Distance [Raw, Default 32]", 32);
entityWhitelist = b.comment("List of entities to not cull based on distance. Example: \"minecraft:bat\"").defineListAllowEmpty(Collections.singletonList("Entity Whitelist"), Collections::emptyList, (s) -> ResourceLocation.tryParse((String) s) != null);
});

builder.Block("Zoom", b -> {
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/vice/magnesium_extras/mixins/EntityDistance/MaxDistanceEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import net.minecraft.client.renderer.culling.ClippingHelper;
import net.minecraft.client.renderer.entity.EntityRendererManager;
import net.minecraft.entity.Entity;
import net.minecraft.util.ResourceLocation;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
Expand All @@ -26,10 +27,15 @@ public <E extends Entity> void shouldDoRender(E entity, ClippingHelper clippingH
cameraZ,
MagnesiumExtrasConfig.maxEntityRenderDistanceY.get(),
MagnesiumExtrasConfig.maxEntityRenderDistanceSquare.get()
))
) && !entityWhitelisted(entity.getType().getRegistryName()))
{
cir.cancel();
}
}

private boolean entityWhitelisted(ResourceLocation s) {
return s != null && MagnesiumExtrasConfig.entityWhitelist.get().stream().anyMatch(s.toString()::equals);
}

}