Compare commits

...
66 changed files with 2223 additions and 342 deletions

No files matched your search

+8 -2
View File
@@ -55,6 +55,12 @@ configurations {
testCompileClasspath.extendsFrom(embedOnly)
}
// Exclude self-reference from all configurations - prevents transitive Angelica deps from resolving against this project
configurations.all {
exclude group: "com.github.GTNewHorizons", module: "Angelica"
}
dependencies {
compileOnly("com.github.GTNewHorizons:Hodgepodge:2.7.14:dev")
@@ -74,8 +80,8 @@ dependencies {
compileOnly "org.apache.ant:ant:1.8.2"
// Celeritas (transitive=false: deps provided by GTNHLib/runtime)
embedOnly("org.embeddedt.celeritas:celeritas-common:2.5.0-GTNH") { transitive = false }
embedOnly("org.embeddedt.celeritas:celeritas-lwjgl2-service:2.5.0-GTNH") { transitive = false }
embedOnly("org.embeddedt.celeritas:celeritas-common:2.5.2-GTNH") { transitive = false }
embedOnly("org.embeddedt.celeritas:celeritas-lwjgl2-service:2.5.2-GTNH") { transitive = false }
// Because who doesn't want NEI
devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.8.35-GTNH:dev')
+32 -2
View File
@@ -39,11 +39,33 @@ remoteMappings = https\://raw.githubusercontent.com/MinecraftForge/FML/1.7.10/co
# `./gradlew runClient --username=AnotherPlayer`, or configuring this command in your IDE.
developmentEnvironmentUserName = Developer
# Enables modern Java syntax support. Valid values:
# - false: No modern syntax, Java 8 only
# - jabel: Jabel syntax-only support, compiles to J8 bytecode
# - jvmDowngrader: Full modern Java via JVM Downgrader (syntax + stdlib APIs)
# - modern: Native modern Java bytecode, no downgrading
enableModernJavaSyntax = jvmDowngrader
jvmDowngraderStubsProvider = gtnhlib
# If set, ignores the above setting and compiles with the given toolchain. This may cause unexpected issues,
# and should *not* be used in most situations. -1 disables this.
# forceToolchainVersion = -1
# Target JVM version for JVM Downgrader bytecode downgrading.
# Only used when enableModernJavaSyntax = jvmDowngrader
# downgradeTargetVersion = 8
# Comma-separated list of Java versions for multi-release jar support (JVM Downgrader only).
# Classes will be available in META-INF/versions/N/ for each version N in this list.
# Default: "21,25" (J25+ gets native classes, J21-24 gets partial downgrade, J8-20 gets full downgrade).
jvmDowngraderMultiReleaseVersions = 17, 21, 25
#forceToolchainVersion = 25
# Specifies how JVM Downgrader API stubs are provided. Options:
# - shade: Shade minimized stubs into the jar
# - gtnhlib: GTNHLib provides stubs at runtime (adds version constraint)
# - external: Another dependency provides stubs (no constraint, no warning)
# - (empty): Warning reminding you to configure stubs
# Note: 'shade' option requires you to verify license compliance, see: https://github.com/unimined/JvmDowngrader/blob/main/LICENSE.md
jvmDowngraderStubsProvider = gtnhlib
# Enables injecting missing generics into the decompiled source code for a better coding experience.
# Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
@@ -57,6 +79,14 @@ generateGradleTokenClass = com.gtnewhorizons.angelica.Tags
# Name of the token containing the project's current version to generate/replace.
gradleTokenVersion = VERSION
# [DEPRECATED]
# Multiple source files can be defined here by providing a comma-separated list: Class1.java,Class2.java,Class3.java
# public static final String VERSION = "GRADLETOKEN_VERSION";
# The string's content will be replaced with your mod's version when compiled. You should use this to specify your mod's
# version in @Mod([...], version = VERSION, [...]).
# Leave these properties empty to skip individual token replacements.
# replaceGradleTokenInFile =
# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
# leave this property empty.
# Example value: (apiPackage = api) + (modGroup = com.myname.mymodid) -> com.myname.mymodid.api
Binary file not shown.
Vendored
+2 -5
View File
@@ -1,7 +1,7 @@
#!/bin/sh
#
# Copyright © 2015-2021 the original authors.
# Copyright © 2015 the original authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -114,7 +114,6 @@ case "$( uname )" in #(
NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -172,7 +171,6 @@ fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if "$cygwin" || "$msys" ; then
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
JAVACMD=$( cygpath --unix "$JAVACMD" )
@@ -212,8 +210,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
-classpath "$CLASSPATH" \
org.gradle.wrapper.GradleWrapperMain \
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
"$@"
# Stop when "xargs" is not available.
Vendored
+1 -2
View File
@@ -70,11 +70,10 @@ goto fail
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
:end
@rem End local scope for the variables with windows NT shell
+1 -1
View File
@@ -16,5 +16,5 @@ pluginManagement {
}
plugins {
id("com.gtnewhorizons.gtnhsettingsconvention") version("2.0.11")
id("com.gtnewhorizons.gtnhsettingsconvention") version("2.0.13")
}
@@ -5,7 +5,6 @@ import com.gtnewhorizon.gtnhlib.util.font.GlyphReplacements;
import com.gtnewhorizons.angelica.config.FontConfig;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.mixins.interfaces.FontRendererAccessor;
import cpw.mods.fml.client.SplashProgress;
import it.unimi.dsi.fastutil.objects.ObjectArrayList;
import net.coderbot.iris.gl.program.Program;
import net.coderbot.iris.gl.program.ProgramBuilder;
@@ -508,10 +507,16 @@ public class BatchingFontRenderer {
continue;
}
if (FontConfig.enableCustomFont) {
if (FontConfig.enableCustomFont && FontConfig.enableGlyphReplacements) {
String chrReplacement = GlyphReplacements.customGlyphs.get(String.valueOf(chr));
if (chrReplacement != null) {
chr = chrReplacement.charAt(0);
char replacement = chrReplacement.charAt(0);
boolean isReplacementCharAvailable =
FontProviderCustom.getPrimary().isGlyphAvailable(replacement)
|| FontProviderCustom.getFallback().isGlyphAvailable(replacement);
if (isReplacementCharAvailable) {
chr = replacement;
}
}
}
@@ -0,0 +1,105 @@
package com.gtnewhorizons.angelica.client.gui;
import com.google.common.collect.ImmutableList;
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
import com.gtnewhorizons.angelica.dynamiclights.config.EntityLightConfig;
import com.gtnewhorizons.angelica.dynamiclights.config.EntityLightConfigStorage;
import com.gtnewhorizons.angelica.dynamiclights.config.EntityTypeEntry;
import jss.notfine.core.Settings;
import me.jellysquid.mods.sodium.client.gui.options.Option;
import me.jellysquid.mods.sodium.client.gui.options.OptionGroup;
import me.jellysquid.mods.sodium.client.gui.options.OptionImpl;
import me.jellysquid.mods.sodium.client.gui.options.OptionImpact;
import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
import me.jellysquid.mods.sodium.client.gui.options.control.TickBoxControl;
import net.minecraft.client.resources.I18n;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
public class DynamicLightsOptionPages {
public static OptionPage dynamicLights() {
if (!DynamicLights.configEnabled) {
return null;
}
List<OptionGroup> groups = new ArrayList<>();
groups.add(OptionGroup.createBuilder()
.add(Settings.DYNAMIC_LIGHTS.option)
.add(Settings.DYNAMIC_LIGHTS_SHADER_FORCE.option)
.build());
groups.add(OptionGroup.createBuilder()
.add(Settings.DYNAMIC_LIGHTS_FRUSTUM_CULLING.option)
.add(Settings.DYNAMIC_LIGHTS_ADAPTIVE_TICKING.option)
.add(Settings.DYNAMIC_LIGHTS_CULL_TIMEOUT.option)
.build());
groups.add(OptionGroup.createBuilder()
.add(Settings.DYNAMIC_LIGHTS_SLOW_DIST.option)
.add(Settings.DYNAMIC_LIGHTS_SLOWER_DIST.option)
.add(Settings.DYNAMIC_LIGHTS_BACKGROUND_DIST.option)
.build());
// Entity type toggles - grouped by mod ID
List<EntityTypeEntry> allEntities = EntityLightConfig.getAllEntityTypes();
Map<String, List<EntityTypeEntry>> byMod = new LinkedHashMap<>();
for (EntityTypeEntry entry : allEntities) {
byMod.computeIfAbsent(entry.getModId(), _ -> new ArrayList<>()).add(entry);
}
// Create a group for each mod's entities
for (Map.Entry<String, List<EntityTypeEntry>> modEntry : byMod.entrySet()) {
String modId = modEntry.getKey();
List<EntityTypeEntry> entities = modEntry.getValue();
OptionGroup.Builder groupBuilder = OptionGroup.createBuilder();
for (EntityTypeEntry entity : entities) {
Option<Boolean> option = createEntityOption(entity);
if (option != null) {
groupBuilder.add(option);
}
}
// Only add group if it has options
OptionGroup group = groupBuilder.build();
if (!group.getOptions().isEmpty()) {
groups.add(group);
}
}
return new OptionPage(I18n.format("options.dynamiclights.page"), ImmutableList.copyOf(groups));
}
private static Option<Boolean> createEntityOption(EntityTypeEntry entry) {
final String className = entry.getClassName();
// Resolve class once during option creation, not on every get/set
Class<?> resolvedClass;
try {
resolvedClass = Class.forName(className);
} catch (ClassNotFoundException e) {
// Class not loaded, skip this option
return null;
}
final Class<?> entityClass = resolvedClass;
return OptionImpl.createBuilder(Boolean.class, EntityLightConfigStorage.INSTANCE)
.setName(entry.getDisplayName() + " (" + entry.getModId() + ")")
.setTooltip(I18n.format("options.dynamiclights.entity.tooltip", entry.getDisplayName()))
.setControl(TickBoxControl::new)
.setBinding(
(_, value) -> EntityLightConfig.setEntityTypeEnabled(entityClass, value),
storage -> EntityLightConfig.isEntityTypeEnabled(entityClass)
)
.setImpact(OptionImpact.LOW)
.build();
}
}
@@ -70,4 +70,11 @@ public class FontConfig {
@Config.DefaultFloat(1.5F)
@Config.RangeFloat(min = 0.1F, max = 3F)
public static float customFontScale;
@Config.Comment({"Mods can provide Angelica with a mapping of special characters to either get replaced with " +
"different characters or rendered using the default Unicode font. Setting this to false disables the " +
"replacement, which is useful in cases where custom fonts have direct support for these special characters. ",
"See for additional details: https://github.com/GTNewHorizons/Angelica/issues/1239#issuecomment-3729877936"})
@Config.DefaultBoolean(true)
public static boolean enableGlyphReplacements;
}
@@ -0,0 +1,70 @@
package com.gtnewhorizons.angelica.dynamiclights;
import org.jetbrains.annotations.NotNull;
/**
* Calculates the appropriate tick mode for a dynamic light source based on distance from camera and position relative to camera direction.
*/
public final class AdaptiveTickCalculator {
// Distance thresholds in blocks (configurable via settings)
private static int slowDistance = 32; // ~2 chunks
private static int slowerDistance = 64; // ~4 chunks
private static int backgroundDistance = 128; // ~8 chunks
// Squared thresholds for efficient distance comparison
private static int slowDistanceSq = slowDistance * slowDistance;
private static int slowerDistanceSq = slowerDistance * slowerDistance;
private static int backgroundDistanceSq = backgroundDistance * backgroundDistance;
private AdaptiveTickCalculator() {}
/**
* Calculate the appropriate tick mode for a light source.
*/
public static AdaptiveTickMode calculate(@NotNull IDynamicLightSource source, double cameraX, double cameraY, double cameraZ, double lookDirX, double lookDirZ) {
double dx = source.angelica$getDynamicLightX() - cameraX;
double dy = source.angelica$getDynamicLightY() - cameraY;
double dz = source.angelica$getDynamicLightZ() - cameraZ;
double distSq = dx * dx + dy * dy + dz * dz;
// Check if behind camera (dot product of direction to source with look direction)
// Only use X and Z for horizontal check (more stable as player looks up/down)
double dot = dx * lookDirX + dz * lookDirZ;
boolean behindCamera = dot < 0;
// Behind camera always gets BACKGROUND mode
if (behindCamera) {
return AdaptiveTickMode.BACKGROUND;
}
// Distance-based mode selection
if (distSq > backgroundDistanceSq) {
return AdaptiveTickMode.BACKGROUND;
}
if (distSq > slowerDistanceSq) {
return AdaptiveTickMode.SLOWER;
}
if (distSq > slowDistanceSq) {
return AdaptiveTickMode.SLOW;
}
return AdaptiveTickMode.REAL_TIME;
}
public static void setSlowDistance(int distance) {
slowDistance = distance;
slowDistanceSq = distance * distance;
}
public static void setSlowerDistance(int distance) {
slowerDistance = distance;
slowerDistanceSq = distance * distance;
}
public static void setBackgroundDistance(int distance) {
backgroundDistance = distance;
backgroundDistanceSq = distance * distance;
}
}
@@ -0,0 +1,32 @@
package com.gtnewhorizons.angelica.dynamiclights;
/**
* Defines tick modes for adaptive dynamic light updates. Distant or off-screen light sources update less frequently to save CPU.
*/
public enum AdaptiveTickMode {
/** Updates every tick - for nearby, visible light sources */
REAL_TIME(1),
/** Updates every 5 ticks - for light sources at moderate distance */
SLOW(5),
/** Updates every 10 ticks - for light sources at far distance */
SLOWER(10),
/** Updates every 20 ticks - for light sources behind the camera or very far */
BACKGROUND(20);
private final int delay;
AdaptiveTickMode(int delay) {
this.delay = delay;
}
public int getDelay() {
return delay;
}
public boolean shouldTickThisFrame(int worldTick, int sourceHash) {
if (delay <= 1) {
return true;
}
return (worldTick % delay) == Math.abs(sourceHash % delay);
}
}
@@ -0,0 +1,152 @@
package com.gtnewhorizons.angelica.dynamiclights;
import com.gtnewhorizon.gtnhlib.util.CoordinatePacker;
import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
import it.unimi.dsi.fastutil.longs.LongArrayList;
import it.unimi.dsi.fastutil.longs.LongIterator;
import org.embeddedt.embeddium.impl.render.viewport.Viewport;
import org.jetbrains.annotations.NotNull;
import java.util.concurrent.locks.ReentrantReadWriteLock;
/**
* Manages deferred chunk rebuilds for dynamic lights with optional frustum culling. Instead of scheduling chunk rebuilds immediately
* when light sources move, this tracks pending rebuilds and only schedules visible chunks.
*/
public class ChunkRebuildManager {
/** Maps packed chunk position to ticks waiting */
private final Long2IntOpenHashMap pendingRebuilds = new Long2IntOpenHashMap();
private final ReentrantReadWriteLock lock = new ReentrantReadWriteLock();
/** Maximum ticks a pending rebuild can wait before being forced through */
private static int maxTicksWaiting = 100;
/** Reusable lists for processVisible - only used from render thread */
private final LongArrayList candidates = new LongArrayList();
private final LongArrayList toRebuild = new LongArrayList();
private final LongArrayList toIncrement = new LongArrayList();
public static void setMaxTicksWaiting(int ticks) {
maxTicksWaiting = Math.max(20, Math.min(ticks, 600)); // Clamp 1-30 seconds (20-600 ticks)
}
public void requestRebuild(int x, int y, int z) {
final long packed = CoordinatePacker.pack(x, y, z);
lock.writeLock().lock();
try {
// Reset wait counter if already pending, otherwise add new entry
pendingRebuilds.put(packed, 0);
} finally {
lock.writeLock().unlock();
}
}
public void processVisible(Viewport viewport, @NotNull IDynamicLightWorldRenderer renderer) {
candidates.clear();
toRebuild.clear();
toIncrement.clear();
// Phase 1: Collect all pending chunks with read lock (fast)
lock.readLock().lock();
try {
if (pendingRebuilds.isEmpty()) {
return;
}
// Collect candidates that might need processing
final var iterator = pendingRebuilds.long2IntEntrySet().fastIterator();
while (iterator.hasNext()) {
final var entry = iterator.next();
final long packed = entry.getLongKey();
final int ticksWaiting = entry.getIntValue();
// Force process if no viewport or waited too long
if (viewport == null || ticksWaiting >= maxTicksWaiting) {
toRebuild.add(packed);
} else {
candidates.add(packed);
}
}
} finally {
lock.readLock().unlock();
}
// Phase 2: Check visibility
for (int i = 0; i < candidates.size(); i++) {
long packed = candidates.getLong(i);
int x = CoordinatePacker.unpackX(packed);
int y = CoordinatePacker.unpackY(packed);
int z = CoordinatePacker.unpackZ(packed);
if (isChunkVisible(viewport, x, y, z)) {
toRebuild.add(packed);
} else {
toIncrement.add(packed);
}
}
// Phase 3: Update map with write lock (brief)
if (!toRebuild.isEmpty() || !toIncrement.isEmpty()) {
lock.writeLock().lock();
try {
// Remove chunks we're going to rebuild
LongIterator rebuildIter = toRebuild.iterator();
while (rebuildIter.hasNext()) {
pendingRebuilds.remove(rebuildIter.nextLong());
}
LongIterator incIter = toIncrement.iterator();
while (incIter.hasNext()) {
long packed = incIter.nextLong();
int current = pendingRebuilds.get(packed);
if (pendingRebuilds.containsKey(packed)) {
pendingRebuilds.put(packed, current + 1);
}
}
} finally {
lock.writeLock().unlock();
}
}
// Phase 4: Schedule rebuilds outside of lock
for (int i = 0; i < toRebuild.size(); i++) {
final long packed = toRebuild.getLong(i);
renderer.scheduleRebuildForChunk(
CoordinatePacker.unpackX(packed),
CoordinatePacker.unpackY(packed),
CoordinatePacker.unpackZ(packed),
false
);
}
}
private boolean isChunkVisible(Viewport viewport, int chunkX, int chunkY, int chunkZ) {
// Convert chunk section coords to block coords
int blockX = chunkX << 4;
int blockY = chunkY << 4;
int blockZ = chunkZ << 4;
// Check if the 16x16x16 chunk section box is visible
return viewport.isBoxVisible(
blockX, blockY, blockZ,
blockX + 16, blockY + 16, blockZ + 16
);
}
public void clear() {
lock.writeLock().lock();
try {
pendingRebuilds.clear();
} finally {
lock.writeLock().unlock();
}
}
public int getPendingCount() {
lock.readLock().lock();
try {
return pendingRebuilds.size();
} finally {
lock.readLock().unlock();
}
}
}
@@ -8,6 +8,8 @@ import com.gtnewhorizons.angelica.api.IDynamicLightProducer;
import com.gtnewhorizons.angelica.compat.ModStatus;
import com.gtnewhorizons.angelica.compat.battlegear2.Battlegear2Compat;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.dynamiclights.config.EntityLightConfig;
import com.gtnewhorizons.angelica.mixins.interfaces.PrimedEntityAccessor;
import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
import mods.battlegear2.api.core.IBattlePlayer;
@@ -21,12 +23,17 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.client.Minecraft;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.MathHelper;
import org.embeddedt.embeddium.impl.render.viewport.Viewport;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Set;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Predicate;
@@ -36,6 +43,8 @@ public class DynamicLights {
private static IDynamicLightWorldRenderer activeRenderer;
public static DynamicLightsMode Mode = DynamicLightsMode.OFF;
public static boolean ShaderForce = false;
public static boolean FrustumCullingEnabled = true;
public static boolean AdaptiveTickingEnabled = true;
public static final boolean configEnabled = AngelicaConfig.enableDynamicLights;
@@ -43,6 +52,7 @@ public class DynamicLights {
private static final double MAX_RADIUS_SQUARED = MAX_RADIUS * MAX_RADIUS;
private final Set<IDynamicLightSource> dynamicLightSources = new ObjectOpenHashSet<>();
private final ReentrantReadWriteLock lightSourcesLock = new ReentrantReadWriteLock();
private final ChunkRebuildManager chunkRebuildManager = new ChunkRebuildManager();
private long lastUpdate = System.currentTimeMillis();
private int lastUpdateCount = 0;
@@ -82,8 +92,43 @@ public class DynamicLights {
this.lastUpdate = now;
this.lastUpdateCount = 0;
// Get camera info for adaptive ticking
double cameraX = 0, cameraY = 0, cameraZ = 0;
double lookDirX = 0, lookDirZ = 1;
int worldTick = 0;
if (AdaptiveTickingEnabled) {
Minecraft mc = Minecraft.getMinecraft();
if (mc.theWorld != null && mc.renderViewEntity != null) {
cameraX = mc.renderViewEntity.posX;
cameraY = mc.renderViewEntity.posY + mc.renderViewEntity.getEyeHeight();
cameraZ = mc.renderViewEntity.posZ;
worldTick = (int) (mc.theWorld.getTotalWorldTime() & 0x7FFFFFFF);
// Calculate look direction from yaw (normalized horizontal direction)
float yaw = mc.renderViewEntity.rotationYaw;
double yawRad = Math.toRadians(yaw);
lookDirX = -Math.sin(yawRad);
lookDirZ = Math.cos(yawRad);
}
}
this.lightSourcesLock.readLock().lock();
for (var lightSource : this.dynamicLightSources) {
// Entity type filter
if (!EntityLightConfig.isEntityTypeEnabled(lightSource)) {
continue;
}
// Adaptive ticking filter
if (AdaptiveTickingEnabled) {
AdaptiveTickMode mode = AdaptiveTickCalculator.calculate(
lightSource, cameraX, cameraY, cameraZ, lookDirX, lookDirZ);
if (!mode.shouldTickThisFrame(worldTick, lightSource.hashCode())) {
continue;
}
}
if (lightSource.angelica$updateDynamicLight(renderer))
this.lastUpdateCount++;
}
@@ -290,6 +335,51 @@ public class DynamicLights {
return this.getLightmapWithDynamicLight(this.getDynamicLightLevel(x, y, z), lightmap);
}
public List<IDynamicLightSource> getSourcesForChunk(int chunkMinX, int chunkMinY, int chunkMinZ) {
// Chunk center
final double centerX = chunkMinX + 8.0;
final double centerY = chunkMinY + 8.0;
final double centerZ = chunkMinZ + 8.0;
// Max distance from chunk center to any corner is sqrt(3) * 8 ≈ 13.86
// Add MAX_RADIUS to get the search radius (13.86 + 7.75)^2 ≈ 467
final double searchRadiusSq = 470.0; // Slightly padded for safety
List<IDynamicLightSource> result = null;
this.lightSourcesLock.readLock().lock();
try {
for (IDynamicLightSource source : this.dynamicLightSources) {
double dx = source.angelica$getDynamicLightX() - centerX;
double dy = source.angelica$getDynamicLightY() - centerY;
double dz = source.angelica$getDynamicLightZ() - centerZ;
double distSq = dx * dx + dy * dy + dz * dz;
if (distSq <= searchRadiusSq) {
if (result == null) {
result = new ArrayList<>();
}
result.add(source);
}
}
} finally {
this.lightSourcesLock.readLock().unlock();
}
return result != null ? result : Collections.emptyList();
}
public double getDynamicLightLevelFromSources(double x, double y, double z, List<IDynamicLightSource> sources) {
if (sources == null || sources.isEmpty()) {
return 0;
}
double result = 0;
for (int i = 0, size = sources.size(); i < size; i++) {
result = maxDynamicLightLevelExact(x, y, z, sources.get(i), result);
}
return MathHelper.clamp_double(result, 0, 15);
}
/**
* Returns the lightmap with combined light levels.
*
@@ -335,9 +425,32 @@ public class DynamicLights {
}
public static void scheduleChunkRebuild(@NotNull IDynamicLightWorldRenderer renderer, int x, int y, int z) {
if (FrustumCullingEnabled && instance != null) {
instance.chunkRebuildManager.requestRebuild(x, y, z);
} else {
renderer.scheduleRebuildForChunk(x, y, z, false);
}
}
public static void scheduleChunkRebuildForRemoval(@NotNull IDynamicLightWorldRenderer renderer, int x, int y, int z) {
renderer.scheduleRebuildForChunk(x, y, z, false);
}
public static void scheduleChunkRebuildForRemoval(@NotNull IDynamicLightWorldRenderer renderer, long chunkPos) {
scheduleChunkRebuildForRemoval(renderer, CoordinatePacker.unpackX(chunkPos), CoordinatePacker.unpackY(chunkPos), CoordinatePacker.unpackZ(chunkPos));
}
public void processChunkRebuilds(@Nullable Viewport viewport) {
if (activeRenderer == null) {
return;
}
chunkRebuildManager.processVisible(viewport, activeRenderer);
}
public ChunkRebuildManager getChunkRebuildManager() {
return chunkRebuildManager;
}
/**
* Updates the tracked chunk sets.
*
@@ -378,10 +491,7 @@ public class DynamicLights {
* @param submergedInWater {@code true} if the stack is submerged in water, else {@code false}
* @return the luminance of the item
*/
public static int getLuminanceFromItemStack(@NotNull ItemStack stack, boolean submergedInWater) {
// TODO only have certain items not glow in water?
if (submergedInWater) return 0;
public static int getLuminanceFromItemStack(@NotNull ItemStack stack) {
Item item = stack.getItem();
if (item instanceof ItemBlock itemBlock) {
Block block = itemBlock.field_150939_a;
@@ -399,49 +509,53 @@ public class DynamicLights {
public static int getLuminanceFromEntity(@NotNull Entity entity) {
if (entity.fire > 0) return 15;
if (entity.isBurning()) return 15;
boolean inWater = entity.isInsideOfMaterial(Material.water);
// TODO only have certain items not glow in water?
if (inWater) return 0;
if (entity instanceof EntityItem item) {
return getLuminanceFromItemStack(item.getEntityItem(), item.isInsideOfMaterial(Material.water));
return getLuminanceFromItemStack(item.getEntityItem());
}
int luminance = 0;
if (entity instanceof EntityLivingBase living) {
int luminance = 0;
boolean inWater = living.isInsideOfMaterial(Material.water);
// check equipment + hand for light (should work for all entities)
ItemStack itemStack;
for (int i = 0; i < 5; i++) {
if ((itemStack = living.getEquipmentInSlot(i)) != null) {
luminance = Math.max(luminance, getLuminanceFromItemStack(itemStack, inWater));
luminance = Math.max(luminance, getLuminanceFromItemStack(itemStack));
}
}
if (ModStatus.isBattlegearLoaded &&
living instanceof EntityPlayer player &&
player instanceof IBattlePlayer battlePlayer &&
battlePlayer.battlegear2$isBattlemode()
) {
ItemStack offhand = Battlegear2Compat.getBattlegear2Offhand(player);
if (offhand != null) {
luminance = Math.max(luminance, getLuminanceFromItemStack(offhand, inWater));
if (living instanceof EntityPlayer player) {
if (ModStatus.isBattlegearLoaded &&
player instanceof IBattlePlayer battlePlayer &&
battlePlayer.battlegear2$isBattlemode()
) {
ItemStack offhand = Battlegear2Compat.getBattlegear2Offhand(player);
if (offhand != null) {
luminance = Math.max(luminance, getLuminanceFromItemStack(offhand));
}
}
}
else if (ModStatus.isBackhandLoaded && living instanceof EntityPlayer player){
ItemStack offhand = ModStatus.backhandCompat.getOffhandItem(player);
if (offhand != null) {
luminance = Math.max(luminance, getLuminanceFromItemStack(offhand, inWater));
else if (ModStatus.isBackhandLoaded){
ItemStack offhand = ModStatus.backhandCompat.getOffhandItem(player);
if (offhand != null) {
luminance = Math.max(luminance, getLuminanceFromItemStack(offhand));
}
}
}
if (ModStatus.isBaublesLoaded && living instanceof EntityPlayer player){
var playerBaubles = PlayerHandler.getPlayerBaubles(player);
if (playerBaubles != null){
for (int i = 0; i < playerBaubles.getSizeInventory(); i++){
var stack = playerBaubles.getStackInSlot(i);
if (stack != null){
luminance = Math.max(luminance, getLuminanceFromItemStack(stack, inWater));
if (ModStatus.isBaublesLoaded){
var playerBaubles = PlayerHandler.getPlayerBaubles(player);
if (playerBaubles != null){
for (int i = 0; i < playerBaubles.getSizeInventory(); i++){
var stack = playerBaubles.getStackInSlot(i);
if (stack != null){
luminance = Math.max(luminance, getLuminanceFromItemStack(stack));
}
}
}
}
@@ -451,7 +565,10 @@ public class DynamicLights {
}
// TODO: Creepers? TNT? Dusts?
if (entity instanceof PrimedEntityAccessor primedEntity) {
luminance = Math.max(luminance, primedEntity.angelica$getLuminance());
}
return 0;
return luminance;
}
}
@@ -73,6 +73,7 @@ public interface IDynamicLightSource {
* Executed at each tick.
*/
void angelica$dynamicLightTick();
default void angelica$updateLights() {}
boolean angelica$updateDynamicLight(@NotNull IDynamicLightWorldRenderer renderer);
@@ -0,0 +1,187 @@
package com.gtnewhorizons.angelica.dynamiclights.config;
import com.gtnewhorizon.gtnhlib.concurrent.cas.CasMap;
import com.gtnewhorizons.angelica.dynamiclights.IDynamicLightSource;
import cpw.mods.fml.common.registry.EntityRegistry;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.jetbrains.annotations.NotNull;
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
public final class EntityLightConfig {
private static final Logger LOGGER = LogManager.getLogger("Angelica/DynamicLights");
private static final Set<String> disabledClassNames = ConcurrentHashMap.newKeySet();
private static final CasMap<Class<?>, Boolean> enabledCache = new CasMap<>();
private static File configFile;
private static boolean initialized = false;
private EntityLightConfig() {}
public static void init(@NotNull File configDir) {
if (initialized) return;
configFile = new File(configDir, "angelica-dynamiclights-entities.txt");
load();
initialized = true;
}
public static boolean isEntityTypeEnabled(@NotNull IDynamicLightSource source) {
if (!initialized) return true;
return isEntityTypeEnabled(source.getClass());
}
public static boolean isEntityTypeEnabled(@NotNull Class<?> entityClass) {
if (!initialized) return true;
Boolean cached = enabledCache.get(entityClass);
if (cached != null) {
return cached;
}
final boolean enabled = !disabledClassNames.contains(entityClass.getName());
Boolean existing = enabledCache.putIfAbsent(entityClass, enabled);
return existing != null ? existing : enabled;
}
public static void setEntityTypeEnabled(@NotNull Class<?> entityClass, boolean enabled) {
enabledCache.put(entityClass, enabled);
final String className = entityClass.getName();
if (enabled) {
disabledClassNames.remove(className);
} else {
disabledClassNames.add(className);
}
}
@SuppressWarnings("unchecked")
public static List<EntityTypeEntry> getAllEntityTypes() {
List<EntityTypeEntry> entries = new ArrayList<>();
Set<String> seenClasses = new HashSet<>();
Map<String, Class<? extends Entity>> stringToClass = EntityList.stringToClassMapping;
for (Map.Entry<String, Class<? extends Entity>> entry : stringToClass.entrySet()) {
String entityId = entry.getKey();
Class<?> entityClass = entry.getValue();
String className = entityClass.getName();
if (seenClasses.contains(className)) continue;
seenClasses.add(className);
String modId = getModIdForEntity(entityClass, entityId);
String displayName = getDisplayName(entityId, entityClass);
boolean enabled = !disabledClassNames.contains(className);
entries.add(new EntityTypeEntry(displayName, className, modId, enabled));
}
// Sort by mod ID, then by display name
entries.sort((a, b) -> {
int modCompare = a.getModId().compareToIgnoreCase(b.getModId());
if (modCompare != 0) return modCompare;
return a.getDisplayName().compareToIgnoreCase(b.getDisplayName());
});
return entries;
}
@SuppressWarnings("unchecked")
private static String getModIdForEntity(Class<?> entityClass, String entityId) {
// Check EntityRegistry for mod entity entries
if (Entity.class.isAssignableFrom(entityClass)) {
EntityRegistry.EntityRegistration registration = EntityRegistry.instance()
.lookupModSpawn((Class<? extends Entity>) entityClass, false);
if (registration != null && registration.getContainer() != null) {
return registration.getContainer().getModId();
}
}
// Check if it's a vanilla entity (no dot in entity ID)
if (!entityId.contains(".")) {
return "minecraft";
}
// Extract mod ID from entity ID (format: modid.EntityName)
int dotIndex = entityId.indexOf('.');
if (dotIndex > 0) {
return entityId.substring(0, dotIndex);
}
return "unknown";
}
private static String getDisplayName(String entityId, Class<?> entityClass) {
// Use the simple class name, removing package
String simpleName = entityClass.getSimpleName();
if (simpleName.isEmpty()) {
// Anonymous class, use entity ID
return entityId;
}
return simpleName;
}
public static void load() {
if (configFile == null || !configFile.exists()) return;
disabledClassNames.clear();
enabledCache.clear();
try (BufferedReader reader = new BufferedReader(new FileReader(configFile))) {
String line;
while ((line = reader.readLine()) != null) {
line = line.trim();
if (line.isEmpty() || line.startsWith("#")) continue;
// Lines are entity class names that are DISABLED
disabledClassNames.add(line);
}
LOGGER.info("Loaded {} disabled entity types from config", disabledClassNames.size());
} catch (IOException e) {
LOGGER.warn("Failed to load entity light config: {}", e.getMessage());
}
}
public static void save() {
if (configFile == null) return;
try (BufferedWriter writer = new BufferedWriter(new FileWriter(configFile))) {
writer.write("# Angelica Dynamic Lights - Disabled Entity Types");
writer.newLine();
writer.write("# Each line is a fully qualified class name of an entity type that is DISABLED.");
writer.newLine();
writer.write("# Remove a line to re-enable dynamic lighting for that entity type.");
writer.newLine();
writer.newLine();
List<String> sorted = new ArrayList<>(disabledClassNames);
Collections.sort(sorted);
for (String className : sorted) {
writer.write(className);
writer.newLine();
}
LOGGER.info("Saved {} disabled entity types to config", disabledClassNames.size());
} catch (IOException e) {
LOGGER.warn("Failed to save entity light config: {}", e.getMessage());
}
}
}
@@ -0,0 +1,20 @@
package com.gtnewhorizons.angelica.dynamiclights.config;
import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage;
public class EntityLightConfigStorage implements OptionStorage<EntityLightConfigStorage> {
public static final EntityLightConfigStorage INSTANCE = new EntityLightConfigStorage();
private EntityLightConfigStorage() {}
@Override
public EntityLightConfigStorage getData() {
return this;
}
@Override
public void save() {
EntityLightConfig.save();
}
}
@@ -0,0 +1,42 @@
package com.gtnewhorizons.angelica.dynamiclights.config;
import org.jetbrains.annotations.NotNull;
public class EntityTypeEntry {
private final String displayName;
private final String className;
private final String modId;
private boolean enabled;
public EntityTypeEntry(@NotNull String displayName, @NotNull String className, @NotNull String modId, boolean enabled) {
this.displayName = displayName;
this.className = className;
this.modId = modId;
this.enabled = enabled;
}
public String getDisplayName() {
return displayName;
}
public String getClassName() {
return className;
}
public String getModId() {
return modId;
}
public boolean isEnabled() {
return enabled;
}
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
@Override
public String toString() {
return displayName + " (" + modId + ") [" + (enabled ? "ON" : "OFF") + "]";
}
}
@@ -369,6 +369,8 @@ public class DisplayListManager {
// Flush any pending delta, then record pop.
flushMatrix();
currentRecorder.recordPopMatrix();
// Invalidate cached transform
matrixGeneration++;
}
public static void recordViewport(int x, int y, int width, int height) {
@@ -328,6 +328,7 @@ public class GLStateManager {
@Getter protected static final ViewPortStateStack viewportState = new ViewPortStateStack();
@Getter protected static int activeProgram = 0;
@Getter protected static int listBase = 0;
public static void reset() {
runningSplash = true;
@@ -804,6 +805,7 @@ public class GLStateManager {
return switch (pname) {
case GL11.GL_ALPHA_TEST_FUNC -> alphaState.getFunction();
case GL11.GL_DEPTH_FUNC -> depthState.getFunc();
case GL11.GL_LIST_BASE -> listBase;
case GL11.GL_LIST_MODE -> DisplayListManager.getListMode();
case GL11.GL_MATRIX_MODE -> matrixMode.getMode();
case GL11.GL_SHADE_MODEL -> shadeModelState.getValue();
@@ -2137,7 +2139,7 @@ public class GLStateManager {
// TODO: Iris Notifier
if (HAS_MULTIPLE_SET.contains(pname)) {
GL11.glFog(pname, param);
if (pname == GL11.GL_FOG_COLOR && isCachingEnabled()) {
final float red = param.get(0);
final float green = param.get(1);
@@ -2459,7 +2461,7 @@ public class GLStateManager {
// Reset relative transform - subsequent transforms are relative to loaded matrix
DisplayListManager.resetRelativeTransform();
if (mode == RecordMode.COMPILE) {
return;
return;
}
}
if (isCachingEnabled()) {
@@ -3584,24 +3586,28 @@ public class GLStateManager {
// Display List Commands
public static void glCallLists(IntBuffer lists) {
if (DisplayListManager.isRecording()) {
throw new UnsupportedOperationException("glCallLists in display lists not yet implemented - if you see this, please report!");
while (lists.hasRemaining()) {
final int listId = lists.get() + listBase;
glCallList(listId);
}
}
public static void glCallLists(ShortBuffer lists) {
while (lists.hasRemaining()) {
final int listId = (lists.get() & 0xFFFF) + listBase;
glCallList(listId);
}
GL11.glCallLists(lists);
}
public static void glCallLists(ByteBuffer lists) {
if (DisplayListManager.isRecording()) {
throw new UnsupportedOperationException("glCallLists in display lists not yet implemented - if you see this, please report!");
while (lists.hasRemaining()) {
final int listId = (lists.get() & 0xFF) + listBase;
glCallList(listId);
}
GL11.glCallLists(lists);
}
public static void glListBase(int base) {
if (DisplayListManager.isRecording()) {
throw new UnsupportedOperationException("glListBase in display lists not yet implemented - if you see this, please report!");
}
GL11.glListBase(base);
listBase = base;
}
// Clip Plane Commands
@@ -74,6 +74,8 @@ public enum Mixins implements IMixins {
, "angelica.dynamiclights.MixinEntity"
, "angelica.dynamiclights.MixinWorld"
, "angelica.dynamiclights.MixinItemRenderer"
, "angelica.dynamiclights.MixinEntityCreeper"
, "angelica.dynamiclights.MixinEntityTNTPrimed"
)
),
@@ -200,9 +202,13 @@ public enum Mixins implements IMixins {
, "shaders.MixinLocale"
, "shaders.MixinOpenGlHelper"
, "shaders.MixinRender"
, "shaders.MixinRenderBiped"
, "shaders.MixinRenderEntityFlame"
, "shaders.MixinRendererLivingEntity"
, "shaders.MixinRenderGlobal"
, "shaders.MixinRenderHorse"
, "shaders.MixinRenderItem"
, "shaders.MixinRenderPlayerArmor"
, "shaders.MixinTileEntityBeaconRenderer"
)
),
@@ -0,0 +1,5 @@
package com.gtnewhorizons.angelica.mixins.interfaces;
public interface PrimedEntityAccessor {
int angelica$getLuminance();
}
@@ -14,6 +14,7 @@ import com.gtnewhorizons.angelica.debug.F3Direction;
import com.gtnewhorizons.angelica.debug.FrametimeGraph;
import com.gtnewhorizons.angelica.debug.TPSGraph;
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
import com.gtnewhorizons.angelica.dynamiclights.config.EntityLightConfig;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.glsm.debug.OpenGLDebugging;
import com.gtnewhorizons.angelica.hudcaching.HUDCaching;
@@ -21,6 +22,7 @@ import com.gtnewhorizons.angelica.mixins.interfaces.IGameSettingsExt;
import com.gtnewhorizons.angelica.render.CloudRenderer;
import com.gtnewhorizons.angelica.rendering.AngelicaBlockSafetyRegistry;
import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasDebugScreenHandler;
import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasSetup;
import com.gtnewhorizons.angelica.rendering.celeritas.threading.ChunkTaskRegistry;
import com.gtnewhorizons.angelica.rendering.celeritas.threading.DefaultChunkTaskProvider;
import com.gtnewhorizons.angelica.rendering.celeritas.threading.ThreadedChunkTaskProvider;
@@ -65,9 +67,7 @@ import net.minecraftforge.client.event.GuiOpenEvent;
import net.minecraftforge.client.event.RenderGameOverlayEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.world.WorldEvent;
import org.embeddedt.embeddium.impl.gl.device.GLRenderDevice;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL15;
public class ClientProxy extends CommonProxy {
@@ -115,8 +115,10 @@ public class ClientProxy extends CommonProxy {
HUDCaching.init();
}
if (AngelicaConfig.enableCeleritas) {
GLRenderDevice.VANILLA_STATE_RESETTER = () -> GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
CeleritasSetup.ensureInitialized();
MinecraftForge.EVENT_BUS.register(CeleritasDebugScreenHandler.INSTANCE);
} else {
LOGGER.info("Celeritas is disabled, skipping initialization from init()");
}
if (AngelicaConfig.enableIris) {
MinecraftForge.EVENT_BUS.register(IrisDebugScreenHandler.INSTANCE);
@@ -141,6 +143,9 @@ public class ClientProxy extends CommonProxy {
if (AngelicaConfig.enableZoom) {
Zoom.init();
}
if (AngelicaConfig.enableDynamicLights) {
EntityLightConfig.init(new java.io.File(mc.mcDataDir, "config"));
}
// Register debug commands in dev environment only
if (!AngelicaTweaker.isObfEnv()) {
@@ -1,6 +1,9 @@
package com.gtnewhorizons.angelica.rendering.celeritas;
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
import com.gtnewhorizons.angelica.dynamiclights.IDynamicLightSource;
import java.util.List;
import com.gtnewhorizons.angelica.rendering.celeritas.iris.BlockRenderContext;
import com.gtnewhorizons.angelica.rendering.celeritas.iris.IrisExtendedChunkVertexEncoder;
import com.gtnewhorizons.angelica.rendering.celeritas.world.WorldSlice;
@@ -29,12 +32,26 @@ public class AngelicaChunkBuildContext extends ChunkBuildContext {
private final WorldSlice worldSlice;
private final BlockRenderContext blockRenderContext = new BlockRenderContext();
/** Pre-filtered light sources for the current chunk being built. Null if dynamic lights disabled. */
private List<IDynamicLightSource> chunkLightSources;
private DynamicLights dynamicLightsInstance;
public AngelicaChunkBuildContext(RenderPassConfiguration<?> renderPassConfiguration, WorldClient world) {
super(renderPassConfiguration);
this.textureMap = Minecraft.getMinecraft().getTextureMapBlocks();
this.worldSlice = new WorldSlice(world);
}
public void setupDynamicLights(int chunkOriginX, int chunkOriginY, int chunkOriginZ) {
if (DynamicLights.isEnabled()) {
this.dynamicLightsInstance = DynamicLights.get();
this.chunkLightSources = dynamicLightsInstance.getSourcesForChunk(chunkOriginX, chunkOriginY, chunkOriginZ);
} else {
this.dynamicLightsInstance = null;
this.chunkLightSources = null;
}
}
public BlockRenderContext getBlockRenderContext() {
return this.blockRenderContext;
}
@@ -66,7 +83,7 @@ public class AngelicaChunkBuildContext extends ChunkBuildContext {
throw new IllegalStateException("Only quads are supported, got: " + vertexCount);
}
final DynamicLights dynamicLights = DynamicLights.isEnabled() ? DynamicLights.get() : null;
final boolean hasDynamicLights = chunkLightSources != null && !chunkLightSources.isEmpty();
final var encoder = buffers.get(material).getEncoder();
if (encoder instanceof IrisExtendedChunkVertexEncoder iris) {
@@ -96,10 +113,11 @@ public class AngelicaChunkBuildContext extends ChunkBuildContext {
vertex.vanillaNormal = rawBuffer[ptr++];
vertex.light = rawBuffer[ptr++];
if (dynamicLights != null) {
final double dynamicLevel = dynamicLights.getDynamicLightLevel(originX + vertex.x, originY + vertex.y, originZ + vertex.z);
if (hasDynamicLights) {
final double dynamicLevel = dynamicLightsInstance.getDynamicLightLevelFromSources(
originX + vertex.x, originY + vertex.y, originZ + vertex.z, chunkLightSources);
if (dynamicLevel > 0) {
vertex.light = dynamicLights.getLightmapWithDynamicLight(dynamicLevel, vertex.light);
vertex.light = dynamicLightsInstance.getLightmapWithDynamicLight(dynamicLevel, vertex.light);
}
}
}
@@ -93,6 +93,8 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C
final int maxY = minY + 16;
final int maxZ = minZ + 16;
buildContext.setupDynamicLights(minX, minY, minZ);
final BlockPos blockPos = new BlockPos(minX, minY, minZ);
final IBlockAccess region = getBlockAccess();
final SmoothBiomeColorCache biomeColorCache = getBiomeColorCache();
@@ -161,7 +163,7 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C
continue;
}
renderBlock(block, x, y, z, pass, tessellator, renderBlocks,
renderBlock(block, meta, x, y, z, pass, tessellator, renderBlocks,
buffers, buildContext, blockRenderContext, minX, minY, minZ);
}
}
@@ -205,7 +207,7 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C
}
}
protected void renderBlock(Block block, int x, int y, int z, int pass, Tessellator tessellator, RenderBlocks renderBlocks, ChunkBuildBuffers buffers, AngelicaChunkBuildContext buildContext, BlockRenderContext blockRenderContext, int originX, int originY, int originZ) {
protected void renderBlock(Block block, int metadata, int x, int y, int z, int pass, Tessellator tessellator, RenderBlocks renderBlocks, ChunkBuildBuffers buffers, AngelicaChunkBuildContext buildContext, BlockRenderContext blockRenderContext, int originX, int originY, int originZ) {
final Material blockMaterial = block.getMaterial();
final boolean isFluid = blockMaterial == Material.water || blockMaterial == Material.lava;
@@ -224,16 +226,17 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C
if (isFluid) {
contextEncoder.prepareToRenderFluid(blockRenderContext, block, lightValue);
} else {
contextEncoder.prepareToRenderBlock(blockRenderContext, block,
contextEncoder.prepareToRenderBlock(blockRenderContext, block, metadata,
ExtendedDataHelper.BLOCK_RENDER_TYPE, lightValue);
}
}
setRenderPass(pass);
// Trigger side effects from canRenderInPass (some ISBRHs like BuildCraft set global state in this method that gets read elsewhere renderWorldBlock)
block.canRenderInPass(pass);
tessellator.startDrawingQuads();
renderBlocks.renderBlockByRenderType(block, x, y, z);
buildContext.copyRawBuffer(tessellator.rawBuffer, tessellator.vertexCount, buffers,
passMaterial, originX, originY, originZ);
buildContext.copyRawBuffer(tessellator.rawBuffer, tessellator.vertexCount, buffers, passMaterial, originX, originY, originZ);
tessellator.reset();
tessellator.isDrawing = false;
@@ -252,7 +255,7 @@ public abstract class AngelicaChunkBuilderMeshingTask extends ChunkBuilderTask<C
mainTessellator.setTranslation(-minX, -minY, -minZ);
for (DeferredBlock deferred : deferredBlocks) {
renderBlock(deferred.block(), deferred.x(), deferred.y(), deferred.z(), deferred.pass(),
renderBlock(deferred.block(), deferred.meta(), deferred.x(), deferred.y(), deferred.z(), deferred.pass(),
mainTessellator, mainThreadRenderBlocks, buffers, buildContext,
blockRenderContext, minX, minY, minZ);
}
@@ -1,6 +1,7 @@
package com.gtnewhorizons.angelica.rendering.celeritas;
import com.gtnewhorizons.angelica.Tags;
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
import com.gtnewhorizons.angelica.glsm.GLStateManager;
import com.gtnewhorizons.angelica.glsm.states.FogState;
import cpw.mods.fml.common.eventhandler.EventPriority;
@@ -33,6 +34,10 @@ public class CeleritasDebugScreenHandler {
event.left.add(getFogDebugString());
}
if (DynamicLights.configEnabled && DynamicLights.isEnabled()) {
event.left.add(getDynamicLightsDebugString());
}
event.right.add("");
event.right.add(EnumChatFormatting.GREEN + "Angelica " + Tags.VERSION + " [Celeritas Renderer]");
event.right.addAll(renderer.getDebugStrings());
@@ -58,4 +63,16 @@ public class CeleritasDebugScreenHandler {
fog.getFogColor().y,
fog.getFogColor().z);
}
public static String getDynamicLightsDebugString() {
final DynamicLights dl = DynamicLights.get();
int sources = dl.getLightSourcesCount();
int updated = dl.getLastUpdateCount();
if (DynamicLights.FrustumCullingEnabled) {
int pending = dl.getChunkRebuildManager().getPendingCount();
return String.format("DynLights: %d src, %d upd, %d pending", sources, updated, pending);
}
return String.format("DynLights: %d sources, %d updated", sources, updated);
}
}
@@ -0,0 +1,18 @@
package com.gtnewhorizons.angelica.rendering.celeritas;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import org.embeddedt.embeddium.impl.gl.device.GLRenderDevice;
import org.lwjgl.opengl.GL15;
import static com.gtnewhorizons.angelica.loading.AngelicaTweaker.LOGGER;
public class CeleritasSetup {
private static boolean initialized = false;
public static void ensureInitialized() {
if (!initialized && AngelicaConfig.enableCeleritas) {
GLRenderDevice.VANILLA_STATE_RESETTER = () -> GL15.glBindBuffer(GL15.GL_ARRAY_BUFFER, 0);
LOGGER.debug("Celeritas init");
initialized = true;
}
}
}
@@ -148,6 +148,11 @@ public class CeleritasWorldRenderer extends SimpleWorldRenderer<WorldClient, Ang
super.setupTerrain(viewport, cameraState, frame, spectator, updateChunksImmediately);
// Process deferred dynamic light chunk rebuilds with frustum culling
if (DynamicLights.isEnabled() && DynamicLights.FrustumCullingEnabled) {
DynamicLights.get().processChunkRebuilds(viewport);
}
// Collect tile entities for shadow pass rendering
if (renderSectionManager.isInShadowPass() && IrisShaderProviderHolder.isActive()) {
collectTileEntitiesForShadow();
@@ -1,6 +1,5 @@
package com.gtnewhorizons.angelica.rendering.celeritas.api;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import net.minecraft.block.Block;
import org.embeddedt.embeddium.impl.gl.shader.GlProgram;
import org.embeddedt.embeddium.impl.render.chunk.RenderPassConfiguration;
@@ -28,7 +27,4 @@ public interface IrisShaderProvider {
/** Block render layer overrides from shader pack */
@Nullable Map<Block, RenderLayer> getBlockTypeIds();
/** Block ID matches for extended vertex data */
@Nullable Object2IntMap<Block> getBlockMatches();
}
@@ -5,7 +5,7 @@ import org.embeddedt.embeddium.impl.render.chunk.vertex.format.ChunkVertexEncode
public interface ContextAwareChunkVertexEncoder extends ChunkVertexEncoder {
void prepareToRenderBlock(BlockRenderContext ctx, Block block, short renderType, byte lightValue);
void prepareToRenderBlock(BlockRenderContext ctx, Block block, int metadata, short renderType, byte lightValue);
void prepareToRenderFluid(BlockRenderContext ctx, Block block, byte lightValue);
@@ -4,10 +4,10 @@ import static com.gtnewhorizon.gtnhlib.bytebuf.MemoryUtilities.*;
import static com.gtnewhorizons.angelica.rendering.celeritas.iris.IrisExtendedChunkVertexType.STRIDE;
import static com.gtnewhorizons.angelica.rendering.celeritas.iris.IrisExtendedChunkVertexType.encodeMidTexture;
import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProvider;
import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProviderHolder;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
import lombok.Setter;
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
import net.coderbot.iris.vertices.ExtendedDataHelper;
import net.coderbot.iris.vertices.NormalHelper;
import net.coderbot.iris.vertices.NormI8;
@@ -30,11 +30,10 @@ public class IrisExtendedChunkVertexEncoder implements ContextAwareChunkVertexEn
private final ChunkVertexEncoder baseEncoder = IrisExtendedChunkVertexType.BASE_TYPE.createEncoder();
private final CeleritasQuadView quad = new CeleritasQuadView();
private final Vector3f normal = new Vector3f();
private final Object2IntMap<Block> blockMatches;
private final Reference2ObjectMap<Block, Int2IntMap> blockMetaMatches;
public IrisExtendedChunkVertexEncoder() {
final IrisShaderProvider provider = IrisShaderProviderHolder.getProvider();
this.blockMatches = provider != null ? provider.getBlockMatches() : null;
this.blockMetaMatches = BlockRenderingSettings.INSTANCE.getBlockMetaMatches();
}
// Per-quad accumulators
@@ -46,9 +45,10 @@ public class IrisExtendedChunkVertexEncoder implements ContextAwareChunkVertexEn
private BlockRenderContext context;
@Override
public void prepareToRenderBlock(BlockRenderContext ctx, Block block, short renderType, byte lightValue) {
public void prepareToRenderBlock(BlockRenderContext ctx, Block block, int metadata, short renderType, byte lightValue) {
this.context = ctx;
ctx.blockId = (short) (blockMatches != null ? blockMatches.getOrDefault(block, -1) : -1);
Int2IntMap metaMap = blockMetaMatches != null ? blockMetaMatches.get(block) : null;
ctx.blockId = (short) (metaMap != null ? metaMap.get(metadata) : -1);
ctx.renderType = renderType;
ctx.lightValue = lightValue;
}
@@ -56,7 +56,8 @@ public class IrisExtendedChunkVertexEncoder implements ContextAwareChunkVertexEn
@Override
public void prepareToRenderFluid(BlockRenderContext ctx, Block block, byte lightValue) {
this.context = ctx;
ctx.blockId = (short) (blockMatches != null ? blockMatches.getOrDefault(block, -1) : -1);
Int2IntMap metaMap = blockMetaMatches != null ? blockMetaMatches.get(block) : null;
ctx.blockId = (short) (metaMap != null ? metaMap.get(0) : -1);
ctx.renderType = ExtendedDataHelper.FLUID_RENDER_TYPE;
ctx.lightValue = lightValue;
}
@@ -5,6 +5,9 @@ import com.gtnewhorizons.angelica.compat.ModStatus;
import com.gtnewhorizons.angelica.compat.mojang.ChunkSectionPos;
import com.gtnewhorizons.angelica.compat.mojang.CompatMathHelper;
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
import com.gtnewhorizons.angelica.dynamiclights.IDynamicLightSource;
import java.util.List;
import com.gtnewhorizons.angelica.rendering.celeritas.world.cloned.ChunkRenderContext;
import com.gtnewhorizons.angelica.rendering.celeritas.world.cloned.ClonedChunkSection;
import com.gtnewhorizons.angelica.rendering.celeritas.world.cloned.ClonedChunkSectionCache;
@@ -95,6 +98,9 @@ public class WorldSlice implements IBlockAccessExtended, FLBlockAccess {
private ChunkSectionPos origin;
private StructureBoundingBox volume;
private List<IDynamicLightSource> chunkLightSources;
private DynamicLights dynamicLightsInstance;
public static ChunkRenderContext prepare(World world, ChunkSectionPos origin, ClonedChunkSectionCache sectionCache) {
final Chunk chunk = world.getChunkFromChunkCoords(origin.x, origin.z);
final ExtendedBlockStorage section = chunk.getBlockStorageArray()[origin.y];
@@ -181,6 +187,15 @@ public class WorldSlice implements IBlockAccessExtended, FLBlockAccess {
this.baseZ = (this.origin.z - NEIGHBOR_CHUNK_RADIUS) << 4;
Arrays.fill(this.biomeData, null);
// Pre-filter dynamic light sources for this chunk section
if (DynamicLights.isEnabled()) {
this.dynamicLightsInstance = DynamicLights.get();
this.chunkLightSources = dynamicLightsInstance.getSourcesForChunk(this.origin.getMinX(), this.origin.getMinY(), this.origin.getMinZ());
} else {
this.dynamicLightsInstance = null;
this.chunkLightSources = null;
}
for (int x = 0; x < SECTION_LENGTH; x++) {
for (int y = 0; y < SECTION_LENGTH; y++) {
for (int z = 0; z < SECTION_LENGTH; z++) {
@@ -220,8 +235,13 @@ public class WorldSlice implements IBlockAccessExtended, FLBlockAccess {
blockBrightness = min;
}
if (DynamicLights.isEnabled() && !getBlock(x, y, z).isOpaqueCube()) {
return DynamicLights.get().getLightmapWithDynamicLight(x, y, z, (skyBrightness << 20 | blockBrightness << 4));
if (chunkLightSources != null && !chunkLightSources.isEmpty() && !getBlock(x, y, z).isOpaqueCube()) {
final int lightmap = skyBrightness << 20 | blockBrightness << 4;
final double dynamicLevel = dynamicLightsInstance.getDynamicLightLevelFromSources(x + 0.5, y + 0.5, z + 0.5, chunkLightSources);
if (dynamicLevel > 0) {
return dynamicLightsInstance.getLightmapWithDynamicLight(dynamicLevel, lightmap);
}
return lightmap;
}
return skyBrightness << 20 | blockBrightness << 4;
@@ -1,6 +1,8 @@
package jss.notfine.core;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
import com.gtnewhorizons.angelica.dynamiclights.AdaptiveTickCalculator;
import com.gtnewhorizons.angelica.dynamiclights.ChunkRebuildManager;
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
import com.gtnewhorizons.angelica.dynamiclights.DynamicLightsMode;
import cpw.mods.fml.relauncher.Side;
@@ -60,6 +62,42 @@ public enum Settings {
DynamicLights.ShaderForce = (boolean) this.option.getStore();
}
},
DYNAMIC_LIGHTS_FRUSTUM_CULLING(new NotFineOptionTickBox(true, OptionImpact.MEDIUM)){
@Override
public void applyChanges() {
DynamicLights.FrustumCullingEnabled = (boolean) this.option.getStore();
}
},
DYNAMIC_LIGHTS_ADAPTIVE_TICKING(new NotFineOptionTickBox(true, OptionImpact.MEDIUM)){
@Override
public void applyChanges() {
DynamicLights.AdaptiveTickingEnabled = (boolean) this.option.getStore();
}
},
DYNAMIC_LIGHTS_SLOW_DIST(new NotFineOptionSlider(32, 16, 64, 8, OptionImpact.LOW)){
@Override
public void applyChanges() {
AdaptiveTickCalculator.setSlowDistance((int) this.option.getStore());
}
},
DYNAMIC_LIGHTS_SLOWER_DIST(new NotFineOptionSlider(64, 32, 128, 16, OptionImpact.LOW)){
@Override
public void applyChanges() {
AdaptiveTickCalculator.setSlowerDistance((int) this.option.getStore());
}
},
DYNAMIC_LIGHTS_BACKGROUND_DIST(new NotFineOptionSlider(128, 64, 256, 16, OptionImpact.LOW)){
@Override
public void applyChanges() {
AdaptiveTickCalculator.setBackgroundDistance((int) this.option.getStore());
}
},
DYNAMIC_LIGHTS_CULL_TIMEOUT(new NotFineOptionSlider(100, 20, 200, 20, OptionImpact.LOW)){
@Override
public void applyChanges() {
ChunkRebuildManager.setMaxTicksWaiting((int) this.option.getStore());
}
},
HORIZON_DISABLE(new NotFineOptionTickBox(true, OptionImpact.LOW)),
FOG_DISABLE(new NotFineOptionTickBox(false, OptionImpact.LOW)),
FOG_NEAR_DISTANCE(new NotFineOptionSliderPercentage(75, 1, 100, 1, OptionImpact.LOW)),
@@ -189,8 +189,6 @@ public class NotFineGameOptionPages {
.add(Settings.MODE_WATER.option)
.add(Settings.DOWNFALL_DISTANCE.option)
.add(Settings.MODE_VIGNETTE.option)
.add(Settings.DYNAMIC_LIGHTS.option, DynamicLights.configEnabled)
.add(Settings.DYNAMIC_LIGHTS_SHADER_FORCE.option, DynamicLights.configEnabled)
.add(Settings.MODE_SHADOWS.option)
.add(Settings.VOID_FOG.option)
.add(Settings.MODE_DROPPED_ITEMS.option)
@@ -5,19 +5,7 @@ import me.jellysquid.mods.sodium.client.util.Dim2i;
public interface OptionExtended<T> extends Option<T> {
boolean isHighlight();
void setHighlight(boolean highlight);
Dim2i getDim2i();
void setDim2i(Dim2i dim2i);
Dim2i getParentDimension();
void setParentDimension(Dim2i dim2i);
boolean isSelected();
void setSelected(boolean selected);
}
@@ -14,6 +14,7 @@ import me.jellysquid.mods.sodium.client.gui.SodiumGameOptionPages;
import me.jellysquid.mods.sodium.client.gui.SodiumOptionsGUI;
import me.jellysquid.mods.sodium.client.gui.options.Option;
import me.jellysquid.mods.sodium.client.gui.options.OptionFlag;
import me.jellysquid.mods.sodium.client.gui.options.OptionGroup;
import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
import me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage;
import me.jellysquid.mods.sodium.client.gui.widgets.FlatButtonWidget;
@@ -28,6 +29,7 @@ import org.lwjgl.input.Keyboard;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Predicate;
import java.util.stream.Stream;
public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
@@ -39,7 +41,6 @@ public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
private static final AtomicReference<Integer> optionPageScrollBarOffset = new AtomicReference<>(0);
private static final AtomicReference<String> lastSearch = new AtomicReference<>("");
private static final AtomicReference<Integer> lastSearchIndex = new AtomicReference<>(0);
private AbstractFrame frame;
private SearchTextFieldComponent searchTextField;
@@ -51,8 +52,14 @@ public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
// Hackalicious! Rebuild UI
@Override
public void rebuildGUI() {
// Preserve search focus state across rebuilds
boolean wasSearchFocused = this.searchTextField != null && this.searchTextField.isFocused();
this.children.clear();
this.initGui();
if (wasSearchFocused && this.searchTextField != null) {
this.searchTextField.setFocused(true);
this.setFocused(this.searchTextField);
}
}
@@ -98,62 +105,85 @@ public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
this.applyButton = new FlatButtonWidget(applyButtonDim, "Apply", this::applyChanges);
this.closeButton = new FlatButtonWidget(closeButtonDim, "Close", this::onClose);
// Pre-compute button text and widths to avoid duplicate calculations
final String irisText = Iris.enabled ? I18n.format(IrisApi.getInstance().getMainScreenLanguageKey()) : null;
final int irisWidth = irisText != null ? this.mc.fontRenderer.getStringWidth(irisText) : 0;
final String fontConfigText = AngelicaConfig.enableFontRenderer ? I18n.format("options.angelica.fontconfig") : null;
final int fontConfigWidth = fontConfigText != null ? this.mc.fontRenderer.getStringWidth(fontConfigText) : 0;
// Total width reserved for buttons (used for search field sizing)
int buttonsWidth = 0;
if (irisText != null) buttonsWidth += irisWidth + 12;
if (fontConfigText != null) buttonsWidth += fontConfigWidth + 14;
// Create search field before parentBasicFrameBuilder (which needs the predicate)
Dim2i searchTextFieldDim = new Dim2i(tabFrameDim.getOriginX(), tabFrameDim.getOriginY() - 26, tabFrameDim.getWidth() - buttonsWidth, 20);
this.searchTextField = new SearchTextFieldComponent(searchTextFieldDim, this.pages, tabFrameSelectedTab,
tabFrameScrollBarOffset, optionPageScrollBarOffset, tabFrameDim.getHeight(), this, lastSearch);
basicFrameBuilder = this.parentBasicFrameBuilder(basicFrameDim, tabFrameDim);
int cumulativeXShift = 0;
if (Iris.enabled) {
//int size = this.client.textRenderer.getWidth(new TranslatableText(IrisApi.getInstance().getMainScreenLanguageKey()));
final String irisText = I18n.format(IrisApi.getInstance().getMainScreenLanguageKey());
final int size = this.mc.fontRenderer.getStringWidth(irisText);
final Dim2i shaderPackButtonDim = new Dim2i(tabFrameDim.getLimitX() - size - 10, tabFrameDim.getOriginY() - 26, 10 + size, 20);
cumulativeXShift += size + 12;
// Add buttons after basicFrameBuilder is created
int buttonX = tabFrameDim.getLimitX();
if (irisText != null) {
buttonX -= irisWidth + 10;
final Dim2i shaderPackButtonDim = new Dim2i(buttonX, tabFrameDim.getOriginY() - 26, irisWidth + 10, 20);
final FlatButtonWidget shaderPackButton = new FlatButtonWidget(shaderPackButtonDim, irisText, () -> mc.displayGuiScreen(new ShaderPackScreen(this)));
basicFrameBuilder.addChild(dim -> shaderPackButton);
buttonX -= 2; // gap between buttons
}
if (AngelicaConfig.enableFontRenderer) {
final String fontConfigText = I18n.format("options.angelica.fontconfig");
final int size = this.mc.fontRenderer.getStringWidth(fontConfigText);
final Dim2i fontConfigButtonDim = new Dim2i(tabFrameDim.getLimitX() - size - 12 - cumulativeXShift, tabFrameDim.getOriginY() - 26, 12 + size, 20);
cumulativeXShift += size + 14;
if (fontConfigText != null) {
buttonX -= fontConfigWidth + 12;
final Dim2i fontConfigButtonDim = new Dim2i(buttonX, tabFrameDim.getOriginY() - 26, fontConfigWidth + 12, 20);
final FlatButtonWidget fontConfigButton = new FlatButtonWidget(fontConfigButtonDim, fontConfigText, () -> mc.displayGuiScreen(new FontConfigScreen(this)));
basicFrameBuilder.addChild(dim -> fontConfigButton);
}
Dim2i searchTextFieldDim = new Dim2i(tabFrameDim.getOriginX(), tabFrameDim.getOriginY() - 26, tabFrameDim.getWidth() - cumulativeXShift, 20);
this.searchTextField = new SearchTextFieldComponent(searchTextFieldDim, this.pages, tabFrameSelectedTab,
tabFrameScrollBarOffset, optionPageScrollBarOffset, tabFrameDim.getHeight(), this, lastSearch, lastSearchIndex);
basicFrameBuilder.addChild(dim -> this.searchTextField);
return basicFrameBuilder;
}
public BasicFrame.Builder parentBasicFrameBuilder(Dim2i parentBasicFrameDim, Dim2i tabFrameDim) {
return BasicFrame.createBuilder()
final Predicate<Option<?>> optionPredicate = searchTextField.getOptionPredicate();
final boolean noResults = searchTextField.hasNoResults();
BasicFrame.Builder builder = BasicFrame.createBuilder()
.setDimension(parentBasicFrameDim)
.shouldRenderOutline(false)
.addChild(parentDim -> TabFrame.createBuilder()
.setDimension(tabFrameDim)
.shouldRenderOutline(false)
.setTabSectionScrollBarOffset(tabFrameScrollBarOffset)
.setTabSectionSelectedTab(tabFrameSelectedTab)
.addTabs(tabs -> this.pages
.stream()
.filter(page -> !page.getGroups().isEmpty())
.forEach(page -> tabs.add(Tab.createBuilder().from(page, optionPageScrollBarOffset)))
)
.onSetTab(() -> {
optionPageScrollBarOffset.set(0);
})
.build()
)
.shouldRenderOutline(false);
if (noResults) {
// Show "No matching options" message centered in the tab area
final String noResultsText = I18n.format("options.angelica.search.no_results");
builder.addChild(dim -> new me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget() {
@Override
public void render(int mouseX, int mouseY, float delta) {
int textWidth = mc.fontRenderer.getStringWidth(noResultsText);
int x = tabFrameDim.getCenterX() - textWidth / 2;
int y = tabFrameDim.getCenterY();
drawString(noResultsText, x, y, 0x808080);
}
});
} else {
builder.addChild(parentDim -> TabFrame.createBuilder()
.setDimension(tabFrameDim)
.shouldRenderOutline(false)
.setTabSectionScrollBarOffset(tabFrameScrollBarOffset)
.setTabSectionSelectedTab(tabFrameSelectedTab)
.addTabs(tabs -> this.pages
.stream()
.filter(this::canShowPage)
.forEach(page -> tabs.add(Tab.createBuilder().from(page, optionPredicate, optionPageScrollBarOffset)))
)
.onSetTab(() -> {
optionPageScrollBarOffset.set(0);
})
.build()
);
}
return builder
.addChild(dim -> this.undoButton)
.addChild(dim -> this.applyButton)
.addChild(dim -> this.closeButton);
@@ -224,6 +254,25 @@ public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
this.getAllOptions().forEach(Option::reset);
}
/**
* Check if a page has any options that match the current search filter.
*/
private boolean canShowPage(OptionPage page) {
if (page.getGroups().isEmpty()) {
return false;
}
Predicate<Option<?>> predicate = searchTextField.getOptionPredicate();
for (OptionGroup group : page.getGroups()) {
for (Option<?> option : group.getOptions()) {
if (predicate.test(option)) {
return true;
}
}
}
return false;
}
@Override
public void keyTyped(char typedChar, int keyCode) {
if(keyCode == Keyboard.KEY_ESCAPE && !shouldCloseOnEsc()) {
@@ -253,7 +302,6 @@ public class ReeseSodiumVideoOptionsScreen extends SodiumOptionsGUI {
@Override
public void onClose() {
lastSearch.set("");
lastSearchIndex.set(0);
super.onClose();
}
}
@@ -18,18 +18,21 @@ import org.apache.commons.lang3.Validate;
import java.util.ArrayList;
import java.util.List;
import java.util.function.Predicate;
public class OptionPageFrame extends AbstractFrame {
protected static final SodiumControlElementFactory elementFactory = new SodiumControlElementFactory();
protected final Dim2i originalDim;
protected final OptionPage page;
protected final Predicate<Option<?>> optionFilter;
private long lastTime = 0;
private ControlElement<?> lastHoveredElement = null;
public OptionPageFrame(Dim2i dim, boolean renderOutline, OptionPage page) {
public OptionPageFrame(Dim2i dim, boolean renderOutline, OptionPage page, Predicate<Option<?>> optionFilter) {
super(dim, renderOutline);
this.originalDim = new Dim2i(dim.getOriginX(), dim.getOriginY(), dim.getWidth(), dim.getHeight());
this.page = page;
this.optionFilter = optionFilter;
this.setupFrame();
this.buildFrame();
}
@@ -48,9 +51,12 @@ public class OptionPageFrame extends AbstractFrame {
OptionGroup lastGroup = this.page.getGroups().get(this.page.getGroups().size() - 1);
for (OptionGroup group : this.page.getGroups()) {
y += group.getOptions().size() * 18;
if (group != lastGroup) {
y += 4;
int visibleCount = (int) group.getOptions().stream() .filter(optionFilter::test) .count();
if (visibleCount > 0) {
y += visibleCount * 18;
if (group != lastGroup) {
y += 4;
}
}
}
}
@@ -73,19 +79,27 @@ public class OptionPageFrame extends AbstractFrame {
int y = 0;
for (OptionGroup group : this.page.getGroups()) {
// Add each option's control element
boolean hasVisibleOptions = false;
// Add each option's control element (if it passes the filter)
for (Option<?> option : group.getOptions()) {
if (!optionFilter.test(option)) {
continue;
}
hasVisibleOptions = true;
final Control<?> control = option.getControl();
final ControlElement<?> element = control.createElement(new Dim2i(this.dim.getOriginX(), this.dim.getOriginY() + y, this.dim.getWidth(), 18), elementFactory);
// This is probably not safe
this.children.add((AbstractWidget) element);
// Move down to the next option
y += 18;
}
// Add padding beneath each option group
y += 4;
// Add padding beneath each option group (only if it had visible options)
if (hasVisibleOptions) {
y += 4;
}
}
super.buildFrame();
@@ -160,6 +174,7 @@ public class OptionPageFrame extends AbstractFrame {
private Dim2i dim;
private boolean renderOutline;
private OptionPage page;
private Predicate<Option<?>> optionFilter = opt -> true;
public Builder setDimension(Dim2i dim) {
this.dim = dim;
@@ -176,11 +191,16 @@ public class OptionPageFrame extends AbstractFrame {
return this;
}
public Builder setOptionFilter(Predicate<Option<?>> optionFilter) {
this.optionFilter = optionFilter;
return this;
}
public OptionPageFrame build() {
Validate.notNull(this.dim, "Dimension must be specified");
Validate.notNull(this.page, "Option Page must be specified");
return new OptionPageFrame(this.dim, this.renderOutline, this.page);
return new OptionPageFrame(this.dim, this.renderOutline, this.page, this.optionFilter);
}
}
}
@@ -2,7 +2,6 @@ package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.components;
import lombok.Getter;
import lombok.Setter;
import me.flashyreese.mods.reeses_sodium_options.client.gui.OptionExtended;
import me.flashyreese.mods.reeses_sodium_options.client.gui.ReeseSodiumVideoOptionsScreen;
import me.flashyreese.mods.reeses_sodium_options.util.StringUtils;
import me.jellysquid.mods.sodium.client.gui.options.Option;
@@ -18,8 +17,10 @@ import net.minecraft.util.MathHelper;
import org.lwjgl.input.Keyboard;
import org.lwjgl.opengl.GL11;
import java.util.HashSet;
import java.util.List;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Predicate;
@@ -34,7 +35,6 @@ public class SearchTextFieldComponent extends AbstractWidget {
private final int tabDimHeight;
private final ReeseSodiumVideoOptionsScreen sodiumVideoOptionsScreen;
private final AtomicReference<String> lastSearch;
private final AtomicReference<Integer> lastSearchIndex;
protected boolean selecting;
protected String text = "";
protected int maxLength = 100;
@@ -50,7 +50,10 @@ public class SearchTextFieldComponent extends AbstractWidget {
private boolean focused;
private int lastCursorPosition = this.getCursor();
public SearchTextFieldComponent(Dim2i dim, List<OptionPage> pages, AtomicReference<String> tabFrameSelectedTab, AtomicReference<Integer> tabFrameScrollBarOffset, AtomicReference<Integer> optionPageScrollBarOffset, int tabDimHeight, ReeseSodiumVideoOptionsScreen sodiumVideoOptionsScreen, AtomicReference<String> lastSearch, AtomicReference<Integer> lastSearchIndex) {
// Set of options matching the current search query (null = show all)
private Set<Option<?>> matchingOptions = null;
public SearchTextFieldComponent(Dim2i dim, List<OptionPage> pages, AtomicReference<String> tabFrameSelectedTab, AtomicReference<Integer> tabFrameScrollBarOffset, AtomicReference<Integer> optionPageScrollBarOffset, int tabDimHeight, ReeseSodiumVideoOptionsScreen sodiumVideoOptionsScreen, AtomicReference<String> lastSearch) {
this.dim = dim;
this.pages = pages;
this.tabFrameSelectedTab = tabFrameSelectedTab;
@@ -59,12 +62,30 @@ public class SearchTextFieldComponent extends AbstractWidget {
this.tabDimHeight = tabDimHeight;
this.sodiumVideoOptionsScreen = sodiumVideoOptionsScreen;
this.lastSearch = lastSearch;
this.lastSearchIndex = lastSearchIndex;
if (!lastSearch.get().trim().isEmpty()) {
this.write(lastSearch.get());
// Initialize text from lastSearch without triggering rebuild
String initialSearch = lastSearch.get().trim();
if (!initialSearch.isEmpty()) {
this.text = initialSearch;
this.selectionStart = initialSearch.length();
this.selectionEnd = initialSearch.length();
// Initialize matching options for the restored search
this.matchingOptions = new HashSet<>(StringUtils.fuzzySearch(this.pages, initialSearch, 2));
}
}
public Predicate<Option<?>> getOptionPredicate() {
return matchingOptions == null ? opt -> true : matchingOptions::contains;
}
public boolean hasSearchQuery() {
return !this.text.trim().isEmpty();
}
public boolean hasNoResults() {
return hasSearchQuery() && matchingOptions != null && matchingOptions.isEmpty();
}
@Override
public void render(int mouseX, int mouseY, float delta) {
if (!this.isVisible()) {
@@ -118,17 +139,22 @@ public class SearchTextFieldComponent extends AbstractWidget {
@Override
public boolean mouseClicked(double mouseX, double mouseY, int button) {
// Right-click to clear search
if (button == 1 && this.dim.containsCursor(mouseX, mouseY)) {
this.text = "";
this.selectionStart = 0;
this.selectionEnd = 0;
this.firstCharacterIndex = 0;
this.onChanged("");
this.setFocused(true);
return true;
}
final int i = MathHelper.floor_double(mouseX) - this.dim.getOriginX() - 6;
final String string = this.textRenderer.trimStringToWidth(this.text.substring(this.firstCharacterIndex), this.getInnerWidth());
this.setCursor(this.textRenderer.trimStringToWidth(string, i).length() + this.firstCharacterIndex);
this.setFocused(this.dim.containsCursor(mouseX, mouseY));
this.pages.forEach(page -> page
.getOptions()
.stream()
.filter(OptionExtended.class::isInstance)
.map(OptionExtended.class::cast)
.forEach(optionExtended -> optionExtended.setSelected(false)));
return this.isFocused();
}
@@ -192,22 +218,16 @@ public class SearchTextFieldComponent extends AbstractWidget {
}
private void onChanged(String newText) {
this.pages.forEach(page -> page
.getOptions()
.stream()
.filter(OptionExtended.class::isInstance)
.map(OptionExtended.class::cast)
.forEach(optionExtended -> optionExtended.setHighlight(false)));
this.lastSearch.set(newText.trim());
if (this.editable && (!newText.trim().isEmpty())) {
final List<Option<?>> fuzzy = StringUtils.fuzzySearch(this.pages, newText, 2);
fuzzy.stream()
.filter(OptionExtended.class::isInstance)
.map(OptionExtended.class::cast)
.forEach(optionExtended -> optionExtended.setHighlight(true));
if (this.editable && !newText.trim().isEmpty()) {
final List<Option<?>> fuzzy = StringUtils.fuzzySearch(this.pages, newText, 2);
this.matchingOptions = new HashSet<>(fuzzy);
} else {
this.matchingOptions = null;
}
this.sodiumVideoOptionsScreen.rebuildGUI();
}
private void erase(int offset) {
@@ -296,8 +316,6 @@ public class SearchTextFieldComponent extends AbstractWidget {
if (!this.selecting) {
this.setSelectionEnd(this.selectionStart);
}
this.onChanged(this.text);
}
public void moveCursor(int offset) {
@@ -368,12 +386,6 @@ public class SearchTextFieldComponent extends AbstractWidget {
//
@Override
public boolean keyTyped(char typedChar, int keyCode) {
this.pages.forEach(page2 -> page2
.getOptions()
.stream()
.filter(OptionExtended.class::isInstance)
.map(OptionExtended.class::cast)
.forEach(optionExtended2 -> optionExtended2.setSelected(false)));
if (!this.isActive()) {
return false;
} else {
@@ -404,42 +416,6 @@ public class SearchTextFieldComponent extends AbstractWidget {
return true;
} else {
switch (keyCode) {
case Keyboard.KEY_RETURN: // GLFW.GLFW_KEY_ENTER
if (this.editable) {
int count = 0;
for (OptionPage page : this.pages) {
for (Option<?> option : page.getOptions()) {
if(option instanceof OptionExtended<?> optionExtended) {
if (optionExtended.isHighlight() && optionExtended.getParentDimension() != null) {
if (count == this.lastSearchIndex.get()) {
final Dim2i optionDim = optionExtended.getDim2i();
final Dim2i parentDim = optionExtended.getParentDimension();
final int maxOffset = parentDim.getHeight() - this.tabDimHeight;
final int input = optionDim.getOriginY() - parentDim.getOriginY();
final int inputOffset = input + optionDim.getHeight() == parentDim.getHeight() ? parentDim.getHeight() : input;
final int offset = inputOffset * maxOffset / parentDim.getHeight();
int total = this.pages.stream().mapToInt(page2 -> Math.toIntExact(page2.getOptions().stream().filter(OptionExtended.class::isInstance).map(OptionExtended.class::cast).filter(OptionExtended::isHighlight).count())).sum();
final int value = total == this.lastSearchIndex.get() + 1 ? 0 : this.lastSearchIndex.get() + 1;
optionExtended.setSelected(true);
this.lastSearchIndex.set(value);
this.tabFrameSelectedTab.set(page.getName());
// todo: calculate tab frame scroll bar offset
this.tabFrameScrollBarOffset.set(0);
this.optionPageScrollBarOffset.set(offset);
this.setFocused(false);
this.sodiumVideoOptionsScreen.rebuildGUI();
return true;
}
count++;
}
}
}
}
}
return true;
case Keyboard.KEY_BACK: // GLFW.GLFW_KEY_BACKSPACE
if (this.editable) {
this.selecting = false;
@@ -481,9 +457,7 @@ public class SearchTextFieldComponent extends AbstractWidget {
default:
if (ChatAllowedCharacters.isAllowedCharacter(typedChar)) {
if (this.editable) {
this.lastSearch.set(this.text.trim());
this.write(Character.toString(typedChar));
this.lastSearchIndex.set(0);
}
return true;
}
@@ -3,11 +3,13 @@ package me.flashyreese.mods.reeses_sodium_options.client.gui.frame.tab;
import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.AbstractFrame;
import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.OptionPageFrame;
import me.flashyreese.mods.reeses_sodium_options.client.gui.frame.ScrollableFrame;
import me.jellysquid.mods.sodium.client.gui.options.Option;
import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
import me.jellysquid.mods.sodium.client.util.Dim2i;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Function;
import java.util.function.Predicate;
public class Tab<T extends AbstractFrame> {
private final String title;
@@ -49,6 +51,10 @@ public class Tab<T extends AbstractFrame> {
}
public Tab<ScrollableFrame> from(OptionPage page, AtomicReference<Integer> verticalScrollBarOffset) {
return from(page, opt -> true, verticalScrollBarOffset);
}
public Tab<ScrollableFrame> from(OptionPage page, Predicate<Option<?>> optionFilter, AtomicReference<Integer> verticalScrollBarOffset) {
return new Tab<>(page.getName(), dim2i -> ScrollableFrame
.createBuilder()
.setDimension(dim2i)
@@ -56,6 +62,7 @@ public class Tab<T extends AbstractFrame> {
.createBuilder()
.setDimension(new Dim2i(dim2i.getOriginX(), dim2i.getOriginY(), dim2i.getWidth(), dim2i.getHeight()))
.setOptionPage(page)
.setOptionFilter(optionFilter)
.build())
.setVerticalScrollBarOffset(verticalScrollBarOffset)
.build());
@@ -38,27 +38,29 @@ public class StringUtils {
for (OptionPage page : pages) {
for (Option<?> option : page.getOptions()) {
String sentence = (option.getName()/* +
" " +
option.getTooltip().getString()+
" " +
option.getImpact().toString()*/).toLowerCase();
String name = option.getName().toLowerCase();
String tooltip = option.getTooltip().toLowerCase();
boolean containsAllWords = true;
for (String word : targetWords) {
boolean containsWord = false;
for (String sentenceWord : sentence.toLowerCase().split("\\s+")) {
int distance = levenshteinDistance(word, sentenceWord);
if (distance <= maxDistance) {
containsWord = true;
break;
}
// Starts with match
if (sentenceWord.startsWith(word)) {
// Fuzzy match on name (handles typos)
// Use stricter matching for short words to avoid false positives (e.g., "fps" matching "fog")
int effectiveMaxDistance = word.length() < 4 ? Math.min(1, maxDistance) : maxDistance;
for (String nameWord : name.split("\\s+")) {
int distance = levenshteinDistance(word, nameWord);
if (distance <= effectiveMaxDistance || nameWord.startsWith(word)) {
containsWord = true;
break;
}
}
// Substring match on tooltip (for discoverability like "fps" -> "frames per second")
if (!containsWord && tooltip.contains(word)) {
containsWord = true;
}
if (!containsWord) {
containsAllWords = false;
break;
@@ -264,8 +264,6 @@ public class SodiumGameOptionPages {
)*/
.add(Settings.MODE_SHADOWS.option)
.add(Settings.MODE_VIGNETTE.option)
.add(Settings.DYNAMIC_LIGHTS.option, DynamicLights.configEnabled)
.add(Settings.DYNAMIC_LIGHTS_SHADER_FORCE.option, DynamicLights.configEnabled)
.build());
@@ -1,9 +1,11 @@
package me.jellysquid.mods.sodium.client.gui;
import com.google.common.collect.ImmutableList;
import com.gtnewhorizons.angelica.client.gui.DynamicLightsOptionPages;
import com.gtnewhorizons.angelica.client.gui.ScrollableGuiScreen;
import com.gtnewhorizons.angelica.compat.mojang.Drawable;
import com.gtnewhorizons.angelica.compat.mojang.Element;
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
import jss.notfine.gui.GuiCustomMenu;
import net.coderbot.iris.Iris;
import me.jellysquid.mods.sodium.client.gui.options.Option;
@@ -61,6 +63,14 @@ public class SodiumOptionsGUI extends ScrollableGuiScreen {
this.pages.add(SodiumGameOptionPages.advanced());
this.pages.add(SodiumGameOptionPages.performance());
// Add Dynamic Lights page if enabled
if (DynamicLights.configEnabled) {
var dlPage = DynamicLightsOptionPages.dynamicLights();
if (dlPage != null) {
this.pages.add(dlPage);
}
}
if (Iris.enabled) {
shaderPacks = new OptionPage(I18n.format("options.iris.shaderPackSelection"), ImmutableList.of());
this.pages.add(shaderPacks);
@@ -214,8 +214,5 @@ public class OptionImpl<S, T> implements OptionExtended<T> {
@Setter @Getter private Dim2i parentDimension;
@Setter @Getter private Dim2i dim2i;
@Setter @Getter private boolean highlight;
@Setter @Getter private boolean selected;
}
@@ -1,6 +1,5 @@
package me.jellysquid.mods.sodium.client.gui.options.control.element;
import me.flashyreese.mods.reeses_sodium_options.client.gui.OptionExtended;
import me.jellysquid.mods.sodium.client.gui.options.Option;
import me.jellysquid.mods.sodium.client.gui.options.control.ControlElement;
import me.jellysquid.mods.sodium.client.gui.widgets.AbstractWidget;
@@ -15,9 +14,6 @@ public class SodiumControlElement<T> extends AbstractWidget implements ControlEl
public SodiumControlElement(Option<T> option, Dim2i dim) {
this.option = option;
this.dim = dim;
if(option instanceof OptionExtended<?> optionExtended) {
optionExtended.setDim2i(dim);
}
}
@Override
@@ -41,16 +37,7 @@ public class SodiumControlElement<T> extends AbstractWidget implements ControlEl
this.hovered = this.dim.containsCursor(mouseX, mouseY);
this.drawRect(this.dim.getOriginX(), this.dim.getOriginY(), this.dim.getLimitX(), this.dim.getLimitY(), this.hovered ? 0xE0000000 : 0x90000000);
if(option instanceof OptionExtended<?> optionExtended && (optionExtended.isHighlight())) {
final String replacement = optionExtended.isSelected() ? EnumChatFormatting.DARK_GREEN.toString() : EnumChatFormatting.YELLOW.toString();
label = label.replace(EnumChatFormatting.WHITE.toString(), EnumChatFormatting.WHITE + replacement);
label = label.replace(EnumChatFormatting.STRIKETHROUGH.toString(), EnumChatFormatting.STRIKETHROUGH + replacement);
label = label.replace(EnumChatFormatting.ITALIC.toString(), EnumChatFormatting.ITALIC + replacement);
}
this.drawString(label, this.dim.getOriginX() + 6, this.dim.getCenterY() - 4, 0xFFFFFFFF);
}
+6 -4
View File
@@ -9,7 +9,9 @@ import com.gtnewhorizons.angelica.config.AngelicaConfig;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.common.gameevent.InputEvent;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
import lombok.Getter;
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
import com.gtnewhorizons.angelica.config.AngelicaConfig;
@@ -860,14 +862,14 @@ public class Iris {
private static int getShaderMaterialOverrideId(Block block, int meta) {
if (contextHolder == null) {
final Object2IntMap<Block> blockMatches = BlockRenderingSettings.INSTANCE.getBlockMatches();
if (blockMatches == null) {
final Reference2ObjectMap<Block, Int2IntMap> blockMetaMatches = BlockRenderingSettings.INSTANCE.getBlockMetaMatches();
if (blockMetaMatches == null) {
return -1;
}
contextHolder = new BlockContextHolder(blockMatches);
contextHolder = new BlockContextHolder(blockMetaMatches);
}
contextHolder.set(block, (short) block.getRenderType());
contextHolder.set(block, meta, (short) block.getRenderType());
return contextHolder.blockId;
}
@@ -1,19 +1,39 @@
package net.coderbot.iris.block_context;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
import net.minecraft.block.Block;
/**
* Holds block context for shader material ID lookups.
*/
public class BlockContextHolder {
private final Object2IntMap<Block> blockMatches;
private final Reference2ObjectMap<Block, Int2IntMap> blockMetaMatches;
public int blockId;
public short renderType;
public BlockContextHolder(Object2IntMap<Block> blockMatches) {
this.blockMatches = blockMatches;
public BlockContextHolder(Reference2ObjectMap<Block, Int2IntMap> blockMetaMatches) {
this.blockMetaMatches = blockMetaMatches;
this.blockId = -1;
this.renderType = -1;
}
public void set(Block block, short renderType) {
/**
* Set the material ID for a block.
* @param block The block
* @param meta The block metadata
* @param renderType The render type
*/
public void set(Block block, int meta, short renderType) {
Int2IntMap metaMap = this.blockMetaMatches != null ? this.blockMetaMatches.get(block) : null;
int id = metaMap != null ? metaMap.get(meta) : -1;
this.blockId = id;
this.renderType = renderType;
this.blockId = blockMatches.getOrDefault(block, -1);
}
public void reset() {
this.blockId = -1;
this.renderType = -1;
}
}
@@ -1,9 +1,12 @@
package net.coderbot.iris.block_rendering;
import com.gtnewhorizons.angelica.compat.toremove.RenderLayer;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
import it.unimi.dsi.fastutil.objects.Reference2ReferenceOpenHashMap;
import net.coderbot.iris.shaderpack.materialmap.BlockEntry;
import net.coderbot.iris.shaderpack.materialmap.BlockRenderType;
@@ -14,14 +17,19 @@ import net.minecraft.util.ResourceLocation;
import java.util.List;
import java.util.Map;
import java.util.Set;
public class BlockMaterialMapping {
public static Object2IntMap<Block> createBlockStateIdMap(Int2ObjectMap<List<BlockEntry>> blockPropertiesMap) {
Object2IntMap<Block> blockMatches = new Object2IntOpenHashMap<>();
/**
* Creates a two-level map structure for block material IDs.
* Based on Iris's BlockState mapping approach adapted for 1.7.10's metadata system.
*/
public static Reference2ObjectMap<Block, Int2IntMap> createBlockMetaIdMap(Int2ObjectMap<List<BlockEntry>> blockPropertiesMap) {
Reference2ObjectMap<Block, Int2IntMap> blockMatches = new Reference2ObjectOpenHashMap<>();
blockPropertiesMap.forEach((intId, entries) -> {
for (BlockEntry entry : entries) {
addBlock(entry, blockMatches, intId);
addBlockMetas(entry, blockMatches, intId);
}
});
@@ -57,7 +65,11 @@ public class BlockMaterialMapping {
};
}
private static void addBlock(BlockEntry entry, Object2IntMap<Block> idMap, int intId) {
/**
* Adds block+metadata combinations to the material ID map.
* Based on Iris's addBlockStates method, adapted for 1.7.10 metadata system.
*/
private static void addBlockMetas(BlockEntry entry, Reference2ObjectMap<Block, Int2IntMap> idMap, int intId) {
final NamespacedId id = entry.getId();
final ResourceLocation resourceLocation = new ResourceLocation(id.getNamespace(), id.getName());
@@ -69,40 +81,25 @@ public class BlockMaterialMapping {
return;
}
idMap.put(block, intId);
Set<Integer> metas = entry.getMetas();
// Set<Integer> metas = entry.getMetas();
// // All metas match
// if (metas.isEmpty()) {
// idMap.putIfAbsent(new BlockMatch(block, null), intId);
// return;
// }
//
// // A subset of metas match
// for(int meta : metas) {
// idMap.putIfAbsent(new BlockMatch(block, meta), intId);
// }
Int2IntMap metaMap = idMap.get(block);
if (metaMap == null) {
metaMap = new Int2IntOpenHashMap();
metaMap.defaultReturnValue(-1);
idMap.put(block, metaMap);
}
if (metas.isEmpty()) {
// Add all metadata values (0-15) if there aren't any specific ones
for (int meta = 0; meta < 16; meta++) {
metaMap.putIfAbsent(meta, intId);
}
} else {
// Add only specific metadata values
for (int meta : metas) {
metaMap.putIfAbsent(meta, intId);
}
}
}
// We ignore generics here, the actual types don't matter because we just convert
// them to strings anyways, and the compiler checks just get in the way.
//
// If you're able to rewrite this function without SuppressWarnings, feel free.
// But otherwise it works fine.
// TODO: BlockStateIdMap
// @SuppressWarnings({"rawtypes", "unchecked"})
// private static boolean checkState(BlockState state, Map<Property<?>, String> expectedValues) {
// for (Map.Entry<Property<?>, String> condition : expectedValues.entrySet()) {
// Property property = condition.getKey();
// String expectedValue = condition.getValue();
//
// String actualValue = property.getName(state.getValue(property));
//
// if (!expectedValue.equals(actualValue)) {
// return false;
// }
// }
//
// return true;
// }
}
@@ -1,8 +1,9 @@
package net.coderbot.iris.block_rendering;
import com.gtnewhorizons.angelica.compat.toremove.RenderLayer;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.objects.Object2IntFunction;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
import lombok.Getter;
import net.coderbot.iris.shaderpack.materialmap.NamespacedId;
import net.minecraft.block.Block;
@@ -16,9 +17,10 @@ public class BlockRenderingSettings {
@Getter
private boolean reloadRequired;
private Object2IntMap<Block> blockMatches;
private Reference2ObjectMap<Block, Int2IntMap> blockMetaMatches;
private Map<Block, RenderLayer> blockTypeIds;
private Object2IntFunction<NamespacedId> entityIds;
private Object2IntFunction<NamespacedId> itemIds;
private float ambientOcclusionLevel;
private boolean disableDirectionalShading;
private boolean useSeparateAo;
@@ -26,7 +28,7 @@ public class BlockRenderingSettings {
public BlockRenderingSettings() {
reloadRequired = false;
blockMatches = null;
blockMetaMatches = null;
blockTypeIds = null;
ambientOcclusionLevel = 1.0F;
disableDirectionalShading = false;
@@ -48,8 +50,8 @@ public class BlockRenderingSettings {
}
@Nullable
public Object2IntMap<Block> getBlockMatches() {
return blockMatches;
public Reference2ObjectMap<Block, Int2IntMap> getBlockMetaMatches() {
return blockMetaMatches;
}
@Nullable
@@ -62,13 +64,14 @@ public class BlockRenderingSettings {
return entityIds;
}
public void setBlockMatches(Object2IntMap<Block> blockIds) {
if (this.blockMatches != null && this.blockMatches.equals(blockIds)) {
return;
}
@Nullable
public Object2IntFunction<NamespacedId> getItemIds() {
return itemIds;
}
public void setBlockMetaMatches(Reference2ObjectMap<Block, Int2IntMap> blockMetaIds) {
this.reloadRequired = true;
this.blockMatches = blockIds;
this.blockMetaMatches = blockMetaIds;
}
public void setBlockTypeIds(Map<Block, RenderLayer> blockTypeIds) {
@@ -85,6 +88,11 @@ public class BlockRenderingSettings {
this.entityIds = entityIds;
}
public void setItemIds(Object2IntFunction<NamespacedId> itemIds) {
// note: no reload needed, items are rendered every frame.
this.itemIds = itemIds;
}
public float getAmbientOcclusionLevel() {
return ambientOcclusionLevel;
}
@@ -2,7 +2,6 @@ package net.coderbot.iris.celeritas;
import com.gtnewhorizons.angelica.rendering.celeritas.api.IrisShaderProvider;
import com.gtnewhorizons.angelica.rendering.celeritas.iris.IrisExtendedChunkVertexType;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import net.coderbot.iris.Iris;
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
import net.coderbot.iris.shadows.ShadowRenderingState;
@@ -66,12 +65,6 @@ public class IrisCeleritasShaderProvider implements IrisShaderProvider {
return BlockRenderingSettings.INSTANCE.getBlockTypeIds();
}
@Override
@Nullable
public Object2IntMap<Block> getBlockMatches() {
return BlockRenderingSettings.INSTANCE.getBlockMatches();
}
public void deleteShaders() {
overrides.deleteShaders();
}
@@ -59,6 +59,7 @@ import net.coderbot.iris.texture.pbr.PBRTextureManager;
import net.coderbot.iris.texture.pbr.PBRType;
import net.coderbot.iris.uniforms.CommonUniforms;
import net.coderbot.iris.uniforms.FrameUpdateNotifier;
import net.coderbot.iris.uniforms.ItemMaterialHelper;
import net.coderbot.iris.uniforms.custom.CustomUniforms;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.EntityRenderer;
@@ -230,11 +231,13 @@ public class DeferredWorldRenderingPipeline implements WorldRenderingPipeline, R
holder -> CommonUniforms.addNonDynamicUniforms(holder, programs.getPack().getIdMap(), programs.getPackDirectives(), this.updateNotifier)
);
// TODO: BlockStateIdMap
BlockRenderingSettings.INSTANCE.setBlockMatches(BlockMaterialMapping.createBlockStateIdMap(programs.getPack().getIdMap().getBlockProperties()));
BlockRenderingSettings.INSTANCE.setBlockMetaMatches(BlockMaterialMapping.createBlockMetaIdMap(programs.getPack().getIdMap().getBlockProperties()));
BlockRenderingSettings.INSTANCE.setBlockTypeIds(BlockMaterialMapping.createBlockTypeMap(programs.getPack().getIdMap().getBlockRenderTypeMap()));
BlockRenderingSettings.INSTANCE.setEntityIds(programs.getPack().getIdMap().getEntityIdMap());
ItemMaterialHelper.clearCache();
BlockRenderingSettings.INSTANCE.setItemIds(programs.getPack().getIdMap().getItemIdMap());
BlockRenderingSettings.INSTANCE.setAmbientOcclusionLevel(programs.getPackDirectives().getAmbientOcclusionLevel());
BlockRenderingSettings.INSTANCE.setDisableDirectionalShading(shouldDisableDirectionalShading());
BlockRenderingSettings.INSTANCE.setUseSeparateAo(programs.getPackDirectives().shouldUseSeparateAo());
@@ -132,6 +132,82 @@ public class IdMap {
return parseIdMap(properties, "entity.", "entity.properties");
}
/**
* Parses a space-delimited list of identifiers.
* Identifiers with spaces or special characters can be enclosed in double quotes.
* Use backslash to escape quotes or backslashes within quoted strings.
*
* Examples (input -> parsed result):
* minecraft:stone natura:berry
* -> minecraft:stone, natura:berry
*
* minecraft:stone "Natura:N Crops"
* -> minecraft:stone, Natura:N Crops
*
* "SomeDumbMod:Foo\\ \"Bar\":3"
* -> SomeDumbMod:Foo\ "Bar":3
*
* @param value The space-delimited string to parse
* @param fileName The name of the properties file (for error messages)
* @param key The property key being parsed (for error messages)
* @return List of parsed identifiers
*/
private static List<String> parseIdentifierList(String value, String fileName, String key) {
if (value.indexOf('"') == -1) {
String[] parts = value.split("\\s+");
List<String> result = new ArrayList<>(parts.length);
for (String part : parts) {
if (!part.isEmpty()) {
result.add(part);
}
}
return result;
}
// Found quote, start of a dumb block ID
List<String> result = new ArrayList<>();
StringBuilder current = new StringBuilder();
boolean inQuotes = false;
boolean escaped = false;
for (int i = 0; i < value.length(); i++) {
char c = value.charAt(i);
if (escaped) {
current.append(c);
escaped = false;
} else if (c == '\\') {
escaped = true;
} else if (c == '"') {
inQuotes = !inQuotes;
} else if (Character.isWhitespace(c) && !inQuotes) {
if (current.length() > 0) {
result.add(current.toString());
current.setLength(0);
}
} else {
current.append(c);
}
}
// Didn't close a quote, warn
if (inQuotes) {
Iris.logger.warn(fileName + " [" + key + "]: Unclosed quote");
}
// Trailing backslash, warn
if (escaped) {
Iris.logger.warn(fileName + " [" + key + "]: Trailing backslash");
}
// Add final token
if (current.length() > 0) {
result.add(current.toString());
}
return result;
}
/**
* Parses a NamespacedId map in OptiFine format
*/
@@ -158,8 +234,8 @@ public class IdMap {
return;
}
// Split on any whitespace
for (String part : value.split("\\s+")) {
// Parse identifiers
for (String part : parseIdentifierList(value, fileName, key)) {
if (part.contains("=")) {
// Avoid tons of logspam for now
Iris.logger.warn("Failed to parse an ResourceLocation in " + fileName + " for the key " + key + ": state properties are currently not supported: " + part);
@@ -209,8 +285,8 @@ public class IdMap {
}
}
// Split on whitespace groups, not just single spaces
for (String part : value.toString().split("\\s+")) {
// Parse identifiers
for (String part : parseIdentifierList(value.toString(), fileName, key)) {
if (part.isEmpty()) {
continue;
}
@@ -255,7 +331,7 @@ public class IdMap {
return;
}
for (String part : value.split("\\s+")) {
for (String part : parseIdentifierList(value, fileName, key)) {
// Note: NamespacedId performs no validation on the content. That will need to be done by whatever is
// converting these things to ResourceLocations.
overrides.put(new NamespacedId(part), renderType);
@@ -34,7 +34,9 @@ public enum ProgramId {
Entities(ProgramGroup.Gbuffers, "entities", TexturedLit),
EntitiesTrans(ProgramGroup.Gbuffers, "entities_translucent", Entities),
EntitiesGlowing(ProgramGroup.Gbuffers, "entities_glowing", Entities),
ArmorGlint(ProgramGroup.Gbuffers, "armor_glint", Textured),
ArmorGlint(ProgramGroup.Gbuffers, "armor_glint", Textured,
new BlendModeOverride(new BlendState(BlendModeFunction.SRC_COLOR.getGlId(), BlendModeFunction.ONE.getGlId(), BlendModeFunction.ONE.getGlId(), BlendModeFunction.ZERO.getGlId()))),
// TODO: Figure out why this is needed in 2.x, this worked properly before without needing an override
SpiderEyes(ProgramGroup.Gbuffers, "spidereyes", Textured,
new BlendModeOverride(new BlendState(BlendModeFunction.SRC_ALPHA.getGlId(), BlendModeFunction.ONE.getGlId(), BlendModeFunction.ZERO.getGlId(), BlendModeFunction.ONE.getGlId()))),
@@ -18,6 +18,10 @@ public class CapturedRenderingState {
private int currentRenderedEntity = -1;
private Runnable entityIdListener = null;
@Getter
private int currentRenderedItem = -1;
private Runnable itemIdListener = null;
@Getter
private final Vector4f currentEntityColor = new Vector4f();
private Runnable entityColorListener = null;
@@ -53,6 +57,18 @@ public class CapturedRenderingState {
}
}
public void setCurrentRenderedItem(int item) {
if (this.currentRenderedItem == item) {
return;
}
this.currentRenderedItem = item;
if (this.itemIdListener != null) {
this.itemIdListener.run();
}
}
public ValueUpdateNotifier getEntityIdNotifier() {
return listener -> this.entityIdListener = listener;
}
@@ -61,5 +77,9 @@ public class CapturedRenderingState {
return listener -> this.blockEntityIdListener = listener;
}
public ValueUpdateNotifier getItemIdNotifier() {
return listener -> this.itemIdListener = listener;
}
public ValueUpdateNotifier getEntityColorNotifier() { return listener -> this.entityColorListener = listener; }
}
@@ -44,6 +44,9 @@ public final class IdMapUniforms {
uniforms.uniform1i("blockEntityId", CapturedRenderingState.INSTANCE::getCurrentRenderedBlockEntity,
CapturedRenderingState.INSTANCE.getBlockEntityIdNotifier());
uniforms.uniform1i("currentRenderedItemId", CapturedRenderingState.INSTANCE::getCurrentRenderedItem,
CapturedRenderingState.INSTANCE.getItemIdNotifier());
}
/**
@@ -0,0 +1,126 @@
package net.coderbot.iris.uniforms;
import it.unimi.dsi.fastutil.ints.Int2IntMap;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
import it.unimi.dsi.fastutil.ints.IntSet;
import it.unimi.dsi.fastutil.objects.Object2IntFunction;
import it.unimi.dsi.fastutil.objects.Reference2ObjectMap;
import it.unimi.dsi.fastutil.objects.Reference2ObjectOpenHashMap;
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
import net.coderbot.iris.shaderpack.materialmap.NamespacedId;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
/**
* Helper class for resolving material IDs for items.
* Checks both item.properties and block.properties.
*/
public class ItemMaterialHelper {
private static final Reference2ObjectMap<Item, Int2IntMap> MATERIAL_CACHE = new Reference2ObjectOpenHashMap<>();
private static final int CACHE_MISS_SENTINEL = Integer.MIN_VALUE;
public static final IntSet WARNED_UNKNOWN_ARMOR_INDICES = new IntOpenHashSet();
/**
* Get the material ID for an ItemStack.
* Checks item.properties first, then block.properties if the item is an ItemBlock.
*
* @param itemStack The item stack to get material ID for
* @return The material ID, or -1 if not found in either map
*/
public static int getMaterialId(ItemStack itemStack) {
if (itemStack == null || itemStack.getItem() == null) {
return -1;
}
return getMaterialId(itemStack.getItem(), itemStack.getItemDamage());
}
public static int getMaterialId(Item item, int metadata) {
if (item == null) {
return -1;
}
// Check cache first
Int2IntMap metadataCache = MATERIAL_CACHE.get(item);
if (metadataCache != null) {
int cached = metadataCache.getOrDefault(metadata, CACHE_MISS_SENTINEL);
if (cached != CACHE_MISS_SENTINEL) {
return cached;
}
}
// Cache miss
int materialId = lookupMaterialId(item, metadata);
if (metadataCache == null) {
metadataCache = new Int2IntOpenHashMap();
metadataCache.defaultReturnValue(CACHE_MISS_SENTINEL);
MATERIAL_CACHE.put(item, metadataCache);
}
metadataCache.put(metadata, materialId);
return materialId;
}
/**
* Perform the actual material ID lookup without caching.
*/
private static int lookupMaterialId(Item item, int metadata) {
String itemIdString = (String) Item.itemRegistry.getNameForObject(item);
if (itemIdString == null) {
return -1;
}
ResourceLocation itemId = new ResourceLocation(itemIdString);
NamespacedId namespacedId = new NamespacedId(itemId.getResourceDomain(), itemId.getResourcePath());
// First, check item.properties
Object2IntFunction<NamespacedId> itemIds = BlockRenderingSettings.INSTANCE.getItemIds();
if (itemIds != null) {
int id = itemIds.applyAsInt(namespacedId);
if (id != -1) {
return id;
}
}
// Second, check block.properties if this is an ItemBlock
if (item instanceof ItemBlock) {
ItemBlock itemBlock = (ItemBlock) item;
Block block = itemBlock.field_150939_a; // The block this item places
if (block == null) {
return -1;
}
// Convert item damage to block metadata
int blockMeta = itemBlock.getMetadata(metadata);
Reference2ObjectMap<Block, Int2IntMap> blockMetaMatches = BlockRenderingSettings.INSTANCE.getBlockMetaMatches();
if (blockMetaMatches != null) {
Int2IntMap metaMap = blockMetaMatches.get(block);
if (metaMap != null) {
int id = metaMap.get(blockMeta);
if (id != -1) {
return id;
}
}
}
}
// Not found in either map
return -1;
}
/**
* Clear the material ID cache.
* Should be called when shader packs are reloaded
*/
public static void clearCache() {
MATERIAL_CACHE.clear();
WARNED_UNKNOWN_ARMOR_INDICES.clear();
}
}
@@ -20,7 +20,7 @@ sodium.options.clouds.tooltip=Controls whether or not clouds will be visible.
sodium.options.gui_scale.tooltip=Sets the maximum scale factor to be used for the user interface. If 'auto' is used, then the largest scale factor will always be used.
sodium.options.fullscreen.tooltip=If enabled, the game will display in full-screen (if supported).
sodium.options.v_sync.tooltip=If enabled, the game's frame rate will be synchronized to the monitor's refresh rate, making for a generally smoother experience at the expense of overall input latency. This setting might reduce performance if your system is too slow.
sodium.options.fps_limit.tooltip=Limits the maximum number of frames per second. This can help reduce battery usage and general system load when multi-tasking. If V-Sync is enabled, this option will be ignored unless it is lower than your display's refresh rate.
sodium.options.fps_limit.tooltip=Limits the maximum FPS (frames per second). This can help reduce battery usage and general system load when multi-tasking. If V-Sync is enabled, this option will be ignored unless it is lower than your display's refresh rate.
sodium.options.view_bobbing.tooltip=If enabled, the player's view will sway and bob when moving around. Players who experience motion sickness while playing can benefit from disabling this.
sodium.options.attack_indicator.tooltip=Controls where the Attack Indicator is displayed on screen.
sodium.options.autosave_indicator.tooltip=If enabled, an indicator will be shown when the game is saving the world to disk.
@@ -134,7 +134,26 @@ options.iris.gui.show=Show GUI
options.dynamic_lights=Dynamic Lights
options.dynamic_lights.tooltip=Enables dynamic lights. Modes: OFF - off, FASTEST - 500ms delay, FAST - 250ms delay, FANCY - 50ms delay, REALTIME - no delay.
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.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.dynamic_lights_frustum_culling=Frustum Culling
options.dynamic_lights_frustum_culling.tooltip=Only rebuild chunks for light sources visible on screen. Reduces GPU work for lights behind the camera.
options.dynamic_lights_adaptive_ticking=Adaptive Ticking
options.dynamic_lights_adaptive_ticking.tooltip=Update distant and off-screen light sources less frequently. Works alongside the global mode setting.
options.dynamic_lights_slow_dist=Slow Update Distance
options.dynamic_lights_slow_dist.tooltip=Distance in blocks where lights update at 1/5 rate. Recommended: 32 blocks (~2 chunks).
options.dynamic_lights_slower_dist=Slower Update Distance
options.dynamic_lights_slower_dist.tooltip=Distance in blocks where lights update at 1/10 rate. Recommended: 64 blocks (~4 chunks).
options.dynamic_lights_background_dist=Background Update Distance
options.dynamic_lights_background_dist.tooltip=Distance in blocks where lights update at 1/20 rate (once per second). Also used for lights behind camera.
options.dynamic_lights_cull_timeout=Culling Timeout (ticks)
options.dynamic_lights_cull_timeout.tooltip=Maximum ticks a hidden chunk can wait before being forced to rebuild. Lower = more responsive but more GPU work.
options.dynamiclights.page=Dynamic Lights
options.dynamiclights.entities=Configure Entities...
options.dynamiclights.entities.title=Dynamic Lights - Entities
options.dynamiclights.entities.info=Toggle which entity types emit dynamic light. Some entries are for mod compatibility.
options.dynamiclights.entities.search=Search (@mod, $on, $off)
options.dynamiclights.entity.tooltip=Toggle dynamic lighting for %s entities. Disable to improve performance if this entity type emits unwanted lights.
options.angelica.search.no_results=No matching options
options.angelica.fontconfig=Font Configuration...
options.angelica.fontconfig.title=Font Configuration
options.angelica.fontconfig.currentfonts=Primary font: §e%s§r Fallback font: §b%s
@@ -51,6 +51,8 @@ public abstract class MixinEntity implements IDynamicLightSource {
private double angelica$prevZ;
@Unique
private LongOpenHashSet angelica$trackedLitChunkPos = new LongOpenHashSet();
@Unique
private LongOpenHashSet angelica$prevTrackedLitChunkPos = new LongOpenHashSet();
@Override
@@ -76,6 +78,11 @@ public abstract class MixinEntity implements IDynamicLightSource {
@Inject(method = "onEntityUpdate", at = @At("TAIL"))
public void angelica$onUpdate(CallbackInfo ci) {
this.angelica$updateLights();
}
@Unique
public void angelica$updateLights() {
if (worldObj != null && worldObj.isRemote) {
if (isDead) {
angelica$setDynamicLightEnabled(false);
@@ -110,17 +117,21 @@ public abstract class MixinEntity implements IDynamicLightSource {
this.angelica$prevZ = this.posZ;
this.angelica$lastLuminance = luminance;
var newPos = new LongOpenHashSet();
final LongOpenHashSet newPos = this.angelica$prevTrackedLitChunkPos;
newPos.clear();
if (luminance > 0) {
IBlockPos chunkPos = new BlockPos(chunkCoordX, MathHelper.floor_double(posY + getEyeHeight()) >> 4, chunkCoordZ);
final float eyeHeight = getEyeHeight();
final double eyeY = posY + eyeHeight;
IBlockPos chunkPos = new BlockPos(chunkCoordX, MathHelper.floor_double(eyeY) >> 4, chunkCoordZ);
DynamicLights.scheduleChunkRebuild(renderer, chunkPos);
DynamicLights.updateTrackedChunks(chunkPos, this.angelica$trackedLitChunkPos, newPos);
var directionX = ((MathHelper.floor_double(posX) & 15) >= 8) ? ForgeDirection.EAST : ForgeDirection.WEST;
var directionY = ((MathHelper.floor_double(posY + getEyeHeight()) & 15) >= 8) ? ForgeDirection.UP : ForgeDirection.DOWN;
var directionZ = ((MathHelper.floor_double(posZ) & 15) >= 8) ? ForgeDirection.SOUTH : ForgeDirection.NORTH;
final var directionX = ((MathHelper.floor_double(posX) & 15) >= 8) ? ForgeDirection.EAST : ForgeDirection.WEST;
final var directionY = ((MathHelper.floor_double(eyeY) & 15) >= 8) ? ForgeDirection.UP : ForgeDirection.DOWN;
final var directionZ = ((MathHelper.floor_double(posZ) & 15) >= 8) ? ForgeDirection.SOUTH : ForgeDirection.NORTH;
for (int i = 0; i < 7; i++) {
if (i % 4 == 0) {
@@ -140,7 +151,8 @@ public abstract class MixinEntity implements IDynamicLightSource {
// Schedules the rebuild of removed chunks.
this.angelica$scheduleTrackedChunksRebuild(renderer);
// Update tracked lit chunks.
// Swap tracked sets
this.angelica$prevTrackedLitChunkPos = this.angelica$trackedLitChunkPos;
this.angelica$trackedLitChunkPos = newPos;
return true;
}
@@ -149,8 +161,40 @@ public abstract class MixinEntity implements IDynamicLightSource {
@Override
public void angelica$scheduleTrackedChunksRebuild(@NotNull IDynamicLightWorldRenderer renderer) {
for (long pos : this.angelica$trackedLitChunkPos) {
DynamicLights.scheduleChunkRebuild(renderer, pos);
if (this.angelica$trackedLitChunkPos.isEmpty()) {
angelica$scheduleRebuildAroundCurrentPosition(renderer);
} else {
var iter = this.angelica$trackedLitChunkPos.iterator();
while (iter.hasNext()) {
DynamicLights.scheduleChunkRebuildForRemoval(renderer, iter.nextLong());
}
}
}
@Unique
private void angelica$scheduleRebuildAroundCurrentPosition(@NotNull IDynamicLightWorldRenderer renderer) {
final float eyeHeight = getEyeHeight();
final double eyeY = posY + eyeHeight;
IBlockPos chunkPos = new BlockPos(chunkCoordX, MathHelper.floor_double(eyeY) >> 4, chunkCoordZ);
DynamicLights.scheduleChunkRebuildForRemoval(renderer, chunkPos.asLong());
final var directionX = ((MathHelper.floor_double(posX) & 15) >= 8) ? ForgeDirection.EAST : ForgeDirection.WEST;
final var directionY = ((MathHelper.floor_double(eyeY) & 15) >= 8) ? ForgeDirection.UP : ForgeDirection.DOWN;
final var directionZ = ((MathHelper.floor_double(posZ) & 15) >= 8) ? ForgeDirection.SOUTH : ForgeDirection.NORTH;
for (int i = 0; i < 7; i++) {
if (i % 4 == 0) {
chunkPos = chunkPos.offset(directionX);
} else if (i % 4 == 1) {
chunkPos = chunkPos.offset(directionZ);
} else if (i % 4 == 2) {
chunkPos = chunkPos.offset(directionX.getOpposite());
} else {
chunkPos = chunkPos.offset(directionZ.getOpposite());
chunkPos = chunkPos.offset(directionY);
}
DynamicLights.scheduleChunkRebuildForRemoval(renderer, chunkPos.asLong());
}
}
}
@@ -0,0 +1,27 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.dynamiclights;
import com.gtnewhorizons.angelica.mixins.interfaces.PrimedEntityAccessor;
import net.minecraft.client.Minecraft;
import net.minecraft.entity.monster.EntityCreeper;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.gen.Accessor;
@Mixin(EntityCreeper.class)
public abstract class MixinEntityCreeper implements PrimedEntityAccessor {
@Shadow
public abstract float getCreeperFlashIntensity(float p_70831_1_);
@Shadow
public abstract int getCreeperState();
@Override
public int angelica$getLuminance() {
// ignore if not fused
if (getCreeperState() != 1) return 0;
float intensity = this.getCreeperFlashIntensity(Minecraft.getMinecraft().timer.renderPartialTicks);
return (int) (intensity * 7);
}
}
@@ -0,0 +1,34 @@
package com.gtnewhorizons.angelica.mixins.early.angelica.dynamiclights;
import com.gtnewhorizons.angelica.dynamiclights.DynamicLights;
import com.gtnewhorizons.angelica.dynamiclights.IDynamicLightSource;
import com.gtnewhorizons.angelica.mixins.interfaces.PrimedEntityAccessor;
import net.minecraft.entity.item.EntityTNTPrimed;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.gen.Accessor;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(EntityTNTPrimed.class)
public abstract class MixinEntityTNTPrimed implements PrimedEntityAccessor {
@Shadow
public int fuse;
@Override
public int angelica$getLuminance() {
// 80 is the default fuse length
int lightLevel = (int) (7.0f * (1.0f - ((float) fuse / 80)));
return Math.max(0, Math.min(7, lightLevel));
}
@Inject(method = "onUpdate", at =@At("RETURN"))
private void angelica$onUpdate(CallbackInfo ci) {
((IDynamicLightSource)(Object)this).angelica$updateLights();
}
}
@@ -7,6 +7,7 @@ import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalExt;
import com.gtnewhorizons.angelica.rendering.AngelicaRenderQueue;
import com.gtnewhorizons.angelica.rendering.RenderingState;
import com.gtnewhorizons.angelica.rendering.celeritas.BlockRenderLayer;
import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasSetup;
import com.gtnewhorizons.angelica.rendering.celeritas.CeleritasWorldRenderer;
import net.coderbot.iris.Iris;
import net.coderbot.iris.layer.GbufferPrograms;
@@ -17,6 +18,7 @@ import net.coderbot.iris.shadows.ShadowRenderingState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.OpenGlHelper;
import net.minecraft.client.renderer.GLAllocation;
import net.minecraft.client.renderer.RenderGlobal;
import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.client.renderer.culling.ICamera;
@@ -63,9 +65,9 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
}
@Redirect(method = "<init>(Lnet/minecraft/client/Minecraft;)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/GLAllocation;generateDisplayLists(I)I", ordinal = 0))
private int celeritas$skipDisplayListAllocation(int count) {
// Skip allocation - celeritas replaces WorldRenderer with its own rendering system
return 0;
private int celeritas$minimizeDisplayListAllocation(int count) {
// Minimize allocation - celeritas replaces WorldRenderer with its own rendering system
return GLAllocation.generateDisplayLists(3);
}
@Redirect(method = "loadRenderers", at = @At(value = "FIELD", target = "Lnet/minecraft/client/renderer/RenderGlobal;renderDistanceChunks:I", opcode = Opcodes.GETFIELD, ordinal = 0))
@@ -212,6 +214,7 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
@Unique
public void angelica$reload() {
CeleritasSetup.ensureInitialized();
RenderDevice.enterManagedCode();
try {
this.celeritas$renderer.reload();
@@ -1,25 +1,88 @@
package com.gtnewhorizons.angelica.mixins.early.shaders;
import com.gtnewhorizons.angelica.compat.mojang.InteractionHand;
import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition;
import net.coderbot.iris.layer.GbufferPrograms;
import net.coderbot.iris.pipeline.HandRenderer;
import net.coderbot.iris.uniforms.CapturedRenderingState;
import net.coderbot.iris.uniforms.ItemMaterialHelper;
import net.irisshaders.iris.api.v0.IrisApi;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.ItemRenderer;
import net.minecraft.item.ItemStack;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/**
* Mixin to handle hand rendering and item ID tracking.
*/
@Mixin(ItemRenderer.class)
public class MixinItemRenderer {
@Inject(method = "renderItemInFirstPerson", at = @At("HEAD"), cancellable = true)
private void iris$skipTranslucentHands(float partialTicks, CallbackInfo ci) {
private void iris$handleFirstPersonRender(float partialTicks, CallbackInfo ci) {
if (IrisApi.getInstance().isShaderPackInUse()) {
boolean isHandTranslucent = HandRenderer.INSTANCE.isHandTranslucent(InteractionHand.MAIN_HAND);
if (HandRenderer.INSTANCE.isRenderingSolid() && isHandTranslucent) {
ci.cancel();
} else if (!HandRenderer.INSTANCE.isRenderingSolid() && !isHandTranslucent) {
boolean isRenderingSolid = HandRenderer.INSTANCE.isRenderingSolid();
if (isRenderingSolid == isHandTranslucent) {
ci.cancel();
return; // Don't set item ID since we're cancelling
}
}
Minecraft mc = Minecraft.getMinecraft();
if (mc.thePlayer == null) {
return;
}
ItemStack itemStack = mc.thePlayer.getCurrentEquippedItem();
if (itemStack == null || itemStack.getItem() == null) {
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
return;
}
// Get material ID from item.properties or block.properties
int id = ItemMaterialHelper.getMaterialId(itemStack);
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id);
}
/**
* Activate GLINT shader before rendering enchantment glint on held items.
* Injects at the first glDepthFunc inside the if(hasEffect) block.
*/
@Inject(
method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V",
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 0),
remap = false
)
private void iris$activateGlintShaderHeldItem(net.minecraft.entity.EntityLivingBase entity, ItemStack itemStack, int renderPass, net.minecraftforge.client.IItemRenderer.ItemRenderType type, CallbackInfo ci) {
GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.GLINT);
}
/**
* Deactivate GLINT shader after rendering enchantment glint on held items.
* Injects at the last glDepthFunc inside the if(hasEffect) block.
*/
@Inject(
method = "renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;ILnet/minecraftforge/client/IItemRenderer$ItemRenderType;)V",
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 1, shift = At.Shift.AFTER),
remap = false
)
private void iris$deactivateGlintShaderHeldItem(net.minecraft.entity.EntityLivingBase entity, ItemStack itemStack, int renderPass, net.minecraftforge.client.IItemRenderer.ItemRenderType type, CallbackInfo ci) {
GbufferPrograms.teardownSpecialRenderCondition();
}
/**
* Reset the item ID after rendering first-person items.
*/
@Inject(
method = "renderItemInFirstPerson",
at = @At("RETURN")
)
private void iris$resetHeldItemId(float partialTicks, CallbackInfo ci) {
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
}
}
@@ -0,0 +1,95 @@
package com.gtnewhorizons.angelica.mixins.early.shaders;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import net.coderbot.iris.uniforms.CapturedRenderingState;
import net.coderbot.iris.uniforms.ItemMaterialHelper;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.entity.RenderBiped;
import net.minecraft.entity.EntityLiving;
import net.minecraft.item.ItemStack;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
/**
* Mixin to set the currentRenderedItem ID when rendering armor on entities.
* This allows shaders to identify and apply different materials to armor pieces.
*/
@Mixin(RenderBiped.class)
public class MixinRenderBiped {
/**
* Set the item ID when rendering armor.
* Wraps the setRenderPassModel call to inject our ID setting logic.
*/
@WrapOperation(
method = "shouldRenderPass(Lnet/minecraft/entity/EntityLiving;IF)I",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderBiped;setRenderPassModel(Lnet/minecraft/client/model/ModelBase;)V")
)
private void iris$setArmorItemId(RenderBiped instance, ModelBase model, Operation<Void> original, EntityLiving entity, int armorSlot, float partialTicks) {
// Get the armor item stack for this slot
ItemStack itemStack = entity.func_130225_q(3 - armorSlot);
if (itemStack == null || itemStack.getItem() == null) {
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
original.call(instance, model);
return;
}
// Get material ID from item.properties or block.properties
int id = ItemMaterialHelper.getMaterialId(itemStack);
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id);
// Call original method
original.call(instance, model);
}
/**
* Reset the item ID at the start of rendering each entity.
* This ensures a clean slate and prevents ID bleed between entities.
*/
@Inject(
method = "doRender(Lnet/minecraft/entity/EntityLiving;DDDFF)V",
at = @At("HEAD")
)
private void iris$resetAtStart(EntityLiving entity, double x, double y, double z, float entityYaw, float partialTicks, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) {
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
}
/**
* Reset the item ID at the start of renderEquippedItems.
* This prevents armor IDs from bleeding into held item rendering.
*/
@Inject(
method = "renderEquippedItems(Lnet/minecraft/entity/EntityLiving;F)V",
at = @At("HEAD")
)
private void iris$resetInEquippedItems(EntityLiving entity, float partialTicks, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) {
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
}
/**
* Set the item ID when rendering held items in third person.
* Wraps renderItem calls to set the ID based on the held item.
*/
@WrapOperation(
method = "renderEquippedItems(Lnet/minecraft/entity/EntityLiving;F)V",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;I)V")
)
private void iris$setHeldItemId(net.minecraft.client.renderer.ItemRenderer itemRenderer, net.minecraft.entity.EntityLivingBase entity, ItemStack itemStack, int renderPass, Operation<Void> original) {
if (itemStack == null || itemStack.getItem() == null) {
original.call(itemRenderer, entity, itemStack, renderPass);
return;
}
// Get material ID from item.properties or block.properties
int id = ItemMaterialHelper.getMaterialId(itemStack);
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id);
original.call(itemRenderer, entity, itemStack, renderPass);
// Reset after rendering the held item
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
}
}
@@ -0,0 +1,84 @@
package com.gtnewhorizons.angelica.mixins.early.shaders;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import net.coderbot.iris.uniforms.CapturedRenderingState;
import net.coderbot.iris.uniforms.ItemMaterialHelper;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.entity.RenderHorse;
import net.minecraft.entity.passive.EntityHorse;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
/**
* Mixin to set the currentRenderedItem ID when rendering horse armor.
* This allows shaders to identify and apply different materials to horse armor.
*/
@Mixin(RenderHorse.class)
public abstract class MixinRenderHorse {
private static final Logger LOGGER = LogManager.getLogger("Angelica");
/**
* Set the item ID when rendering the horse model if it has armor.
* Wraps the mainModel.render() call to set the material ID only around the actual render.
*/
@WrapOperation(
method = "renderModel(Lnet/minecraft/entity/passive/EntityHorse;FFFFFF)V",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/model/ModelBase;render(Lnet/minecraft/entity/Entity;FFFFFF)V")
)
private void iris$setHorseArmorItemId(ModelBase model, net.minecraft.entity.Entity entity, float p1, float p2, float p3, float p4, float p5, float p6, Operation<Void> original, EntityHorse horse) {
// Only set ID if horse has armor equipped
boolean hasArmor = false;
// Check if horse type == 0 (regular horse)
if (horse.func_110259_cr()) {
// Get armor index from DataWatcher (synced from server)
int armorIndex = horse.func_110241_cb();
if (armorIndex > 0) {
// Map armor index to vanilla items
Item armorItem = null;
switch (armorIndex) {
case 1:
armorItem = Items.iron_horse_armor;
break;
case 2:
armorItem = Items.golden_horse_armor;
break;
case 3:
armorItem = Items.diamond_horse_armor;
break;
default:
// Unknown armor index - likely from a mod
// Warn once per unique index to avoid spam
if (!ItemMaterialHelper.WARNED_UNKNOWN_ARMOR_INDICES.contains(armorIndex)) {
ItemMaterialHelper.WARNED_UNKNOWN_ARMOR_INDICES.add(armorIndex);
LOGGER.warn("Unknown horse armor index detected: {}. " +
"This is likely from a mod. Vanilla horse armor uses indices 1-3 (iron/gold/diamond). " +
"Modded horse armor material IDs are not currently supported.", armorIndex);
}
break;
}
if (armorItem != null) {
// Get material ID from item.properties
int id = ItemMaterialHelper.getMaterialId(armorItem, 0);
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id);
hasArmor = true;
}
}
}
// Call original render
original.call(model, entity, p1, p2, p3, p4, p5, p6);
// Reset only if we set it
if (hasArmor) {
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
}
}
}
@@ -0,0 +1,73 @@
package com.gtnewhorizons.angelica.mixins.early.shaders;
import net.coderbot.iris.gbuffer_overrides.matching.SpecialCondition;
import net.coderbot.iris.layer.GbufferPrograms;
import net.coderbot.iris.uniforms.CapturedRenderingState;
import net.coderbot.iris.uniforms.ItemMaterialHelper;
import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.item.ItemStack;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
/**
* Mixin to set the currentRenderedItem ID when rendering dropped items (EntityItem).
* This allows shaders to identify and apply different materials to items on the ground.
*/
@Mixin(RenderItem.class)
public class MixinRenderItem {
/**
* Set the item ID before rendering dropped items.
* Checks both item.properties and block.properties.
*/
@Inject(
method = "doRender(Lnet/minecraft/entity/item/EntityItem;DDDFF)V",
at = @At("HEAD")
)
private void iris$setItemIdBeforeRender(net.minecraft.entity.item.EntityItem entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) {
ItemStack itemStack = entity.getEntityItem();
// Get material ID from item.properties or block.properties
int id = ItemMaterialHelper.getMaterialId(itemStack);
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id);
}
/**
* Activate GLINT shader before rendering enchantment glint.
* Injects at the first glDepthFunc inside the if(hasEffect) block.
*/
@Inject(
method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V",
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 0),
remap = false
)
private void iris$activateGlintShader(net.minecraft.entity.item.EntityItem entity, net.minecraft.util.IIcon icon, int count, float partialTicks, float r, float g, float b, int pass, CallbackInfo ci) {
GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.GLINT);
}
/**
* Deactivate GLINT shader after rendering enchantment glint.
* Injects at the last glDepthFunc inside the if(hasEffect) block.
*/
@Inject(
method = "renderDroppedItem(Lnet/minecraft/entity/item/EntityItem;Lnet/minecraft/util/IIcon;IFFFFI)V",
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 1, shift = At.Shift.AFTER),
remap = false
)
private void iris$deactivateGlintShader(net.minecraft.entity.item.EntityItem entity, net.minecraft.util.IIcon icon, int count, float partialTicks, float r, float g, float b, int pass, CallbackInfo ci) {
GbufferPrograms.teardownSpecialRenderCondition();
}
/**
* Reset the item ID after rendering dropped items.
*/
@Inject(
method = "doRender(Lnet/minecraft/entity/item/EntityItem;DDDFF)V",
at = @At("RETURN")
)
private void iris$resetItemIdAfterRender(net.minecraft.entity.item.EntityItem entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) {
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
}
}
@@ -0,0 +1,95 @@
package com.gtnewhorizons.angelica.mixins.early.shaders;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
import net.coderbot.iris.uniforms.CapturedRenderingState;
import net.coderbot.iris.uniforms.ItemMaterialHelper;
import net.minecraft.client.entity.AbstractClientPlayer;
import net.minecraft.client.model.ModelBase;
import net.minecraft.client.renderer.entity.RenderPlayer;
import net.minecraft.item.ItemStack;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
/**
* Mixin to set the currentRenderedItem ID when rendering armor on the player.
* This allows shaders to identify and apply different materials to player armor pieces.
*/
@Mixin(RenderPlayer.class)
public class MixinRenderPlayerArmor {
/**
* Set the item ID when rendering player armor.
* Wraps the setRenderPassModel call to inject our ID setting logic.
*/
@WrapOperation(
method = "shouldRenderPass(Lnet/minecraft/client/entity/AbstractClientPlayer;IF)I",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/entity/RenderPlayer;setRenderPassModel(Lnet/minecraft/client/model/ModelBase;)V")
)
private void iris$setArmorItemId(RenderPlayer instance, ModelBase model, Operation<Void> original, AbstractClientPlayer player, int armorSlot, float partialTicks) {
// Get the armor item stack for this slot
ItemStack itemStack = player.getCurrentArmor(3 - armorSlot);
if (itemStack == null || itemStack.getItem() == null) {
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
original.call(instance, model);
return;
}
// Get material ID from item.properties or block.properties
int id = ItemMaterialHelper.getMaterialId(itemStack);
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id);
// Call original method
original.call(instance, model);
}
/**
* Reset the item ID at the start of rendering each player.
* This ensures a clean slate and prevents ID bleed between entities.
*/
@Inject(
method = "doRender(Lnet/minecraft/client/entity/AbstractClientPlayer;DDDFF)V",
at = @At("HEAD")
)
private void iris$resetAtStart(AbstractClientPlayer player, double x, double y, double z, float entityYaw, float partialTicks, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) {
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
}
/**
* Reset the item ID at the start of renderEquippedItems.
* This prevents armor IDs from bleeding into cape/held items rendering.
*/
@Inject(
method = "renderEquippedItems(Lnet/minecraft/client/entity/AbstractClientPlayer;F)V",
at = @At("HEAD")
)
private void iris$resetInEquippedItems(AbstractClientPlayer player, float partialTicks, org.spongepowered.asm.mixin.injection.callback.CallbackInfo ci) {
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
}
/**
* Set the item ID when rendering held items in third person.
* Wraps renderItem calls to set the ID based on the held item.
*/
@WrapOperation(
method = "renderEquippedItems(Lnet/minecraft/client/entity/AbstractClientPlayer;F)V",
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItem(Lnet/minecraft/entity/EntityLivingBase;Lnet/minecraft/item/ItemStack;I)V")
)
private void iris$setHeldItemId(net.minecraft.client.renderer.ItemRenderer itemRenderer, net.minecraft.entity.EntityLivingBase entity, ItemStack itemStack, int renderPass, Operation<Void> original) {
if (itemStack == null || itemStack.getItem() == null) {
original.call(itemRenderer, entity, itemStack, renderPass);
return;
}
// Get material ID from item.properties or block.properties
int id = ItemMaterialHelper.getMaterialId(itemStack);
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(id);
original.call(itemRenderer, entity, itemStack, renderPass);
// Reset after rendering the held item
CapturedRenderingState.INSTANCE.setCurrentRenderedItem(-1);
}
}
@@ -14,7 +14,9 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
import org.spongepowered.asm.mixin.injection.Slice;
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(RendererLivingEntity.class)
public class MixinRendererLivingEntity {
@@ -49,4 +51,30 @@ public class MixinRendererLivingEntity {
original.call(instance, entity, p_78088_2_, p_78088_3_, p_78088_4_, p_78088_5_, p_78088_6_, p_78088_7_);
}
}
/**
* Activate GLINT shader before rendering armor enchantment glint.
* Injects at the first glDepthFunc inside the armor glint rendering block.
*/
@Inject(
method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V",
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 0),
remap = false
)
private void iris$activateArmorGlintShader(EntityLivingBase entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) {
GbufferPrograms.setupSpecialRenderCondition(SpecialCondition.GLINT);
}
/**
* Deactivate GLINT shader after rendering armor enchantment glint.
* Injects at the last glDepthFunc inside the armor glint rendering block.
*/
@Inject(
method = "doRender(Lnet/minecraft/entity/EntityLivingBase;DDDFF)V",
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glDepthFunc(I)V", ordinal = 1, shift = At.Shift.AFTER),
remap = false
)
private void iris$deactivateArmorGlintShader(EntityLivingBase entity, double x, double y, double z, float entityYaw, float partialTicks, CallbackInfo ci) {
GbufferPrograms.teardownSpecialRenderCondition();
}
}
@@ -0,0 +1,127 @@
package me.flashyreese.mods.reeses_sodium_options.util;
import com.google.common.collect.ImmutableList;
import me.jellysquid.mods.sodium.client.gui.options.Option;
import me.jellysquid.mods.sodium.client.gui.options.OptionPage;
import org.junit.jupiter.api.Test;
import java.util.List;
import static org.junit.jupiter.api.Assertions.*;
class StringUtilsTest {
// Helper to create a mock option with name and tooltip
private static Option<?> mockOption(String name, String tooltip) {
return new MockOption(name, tooltip);
}
private static OptionPage mockPage(Option<?>... options) {
return new MockOptionPage(ImmutableList.copyOf(options));
}
@Test
void testExactMatch() {
var page = mockPage(mockOption("Max Framerate", "Limits FPS"));
var results = StringUtils.fuzzySearch(List.of(page), "max", 2);
assertEquals(1, results.size());
}
@Test
void testFuzzyMatchWithTypo() {
var page = mockPage(mockOption("Max Framerate", "Limits FPS"));
// "fraemrate" is a typo for "framerate" - should match
var results = StringUtils.fuzzySearch(List.of(page), "fraemrate", 2);
assertEquals(1, results.size(), "Should match 'framerate' with typo 'fraemrate'");
}
@Test
void testFpsMatchesMaxFramerateViaTooltip() {
var page = mockPage(mockOption("Max Framerate", "Limits the maximum FPS (frames per second)."));
var results = StringUtils.fuzzySearch(List.of(page), "fps", 2);
assertEquals(1, results.size(), "Should match 'Max Framerate' when searching 'fps' via tooltip");
}
@Test
void testFpsDoesNotMatchFog() {
var page = mockPage(mockOption("Fog", "Controls fog rendering"));
var results = StringUtils.fuzzySearch(List.of(page), "fps", 2);
assertEquals(0, results.size(), "Should NOT match 'Fog' when searching 'fps'");
}
@Test
void testFpsDoesNotMatchFov() {
var page = mockPage(mockOption("Dynamic FOV", "Controls field of view changes"));
var results = StringUtils.fuzzySearch(List.of(page), "fps", 2);
assertEquals(0, results.size(), "Should NOT match 'Dynamic FOV' when searching 'fps'");
}
@Test
void testCloudDoesNotMatchMaxFramerate() {
var page = mockPage(mockOption("Max Framerate", "Limits FPS. Reduces system load when multi-tasking."));
var results = StringUtils.fuzzySearch(List.of(page), "cloud", 2);
assertEquals(0, results.size(), "Should NOT match 'Max Framerate' when searching 'cloud'");
}
@Test
void testCloudMatchesClouds() {
var page = mockPage(mockOption("Clouds", "Controls cloud rendering"));
var results = StringUtils.fuzzySearch(List.of(page), "cloud", 2);
assertEquals(1, results.size(), "Should match 'Clouds' when searching 'cloud'");
}
@Test
void testPrefixMatch() {
var page = mockPage(mockOption("Brightness", "Controls gamma"));
var results = StringUtils.fuzzySearch(List.of(page), "bri", 2);
assertEquals(1, results.size(), "Should match 'Brightness' with prefix 'bri'");
}
@Test
void testMultiWordSearch() {
var page = mockPage(
mockOption("Max Framerate", "Limits FPS"),
mockOption("Render Distance", "How far to render")
);
var results = StringUtils.fuzzySearch(List.of(page), "max frame", 2);
assertEquals(1, results.size(), "Should match only 'Max Framerate' with multi-word search");
}
// Simple mock implementations for testing
private static class MockOption implements Option<Object> {
private final String name;
private final String tooltip;
MockOption(String name, String tooltip) {
this.name = name;
this.tooltip = tooltip;
}
@Override public String getName() { return name; }
@Override public String getTooltip() { return tooltip; }
@Override public me.jellysquid.mods.sodium.client.gui.options.OptionImpact getImpact() { return null; }
@Override public me.jellysquid.mods.sodium.client.gui.options.control.Control<Object> getControl() { return null; }
@Override public Object getValue() { return null; }
@Override public void setValue(Object value) {}
@Override public void reset() {}
@Override public me.jellysquid.mods.sodium.client.gui.options.storage.OptionStorage<?> getStorage() { return null; }
@Override public boolean isAvailable() { return true; }
@Override public boolean hasChanged() { return false; }
@Override public void applyChanges() {}
@Override public java.util.Collection<me.jellysquid.mods.sodium.client.gui.options.OptionFlag> getFlags() { return List.of(); }
}
private static class MockOptionPage extends OptionPage {
private final ImmutableList<Option<?>> options;
MockOptionPage(ImmutableList<Option<?>> options) {
super("Test", ImmutableList.of());
this.options = options;
}
@Override
public ImmutableList<Option<?>> getOptions() {
return options;
}
}
}