1212import dev .lambdaurora .lambdynlights .accessor .WorldRendererAccessor ;
1313import dev .lambdaurora .lambdynlights .api .DynamicLightHandlers ;
1414import dev .lambdaurora .lambdynlights .api .DynamicLightsInitializer ;
15+ import dev .lambdaurora .lambdynlights .engine .DynamicLightingEngine ;
1516import dev .lambdaurora .lambdynlights .resource .item .ItemLightSources ;
1617import dev .yumi .commons .event .EventManager ;
1718import it .unimi .dsi .fastutil .longs .LongOpenHashSet ;
1819import net .fabricmc .api .ClientModInitializer ;
20+ import net .fabricmc .fabric .api .client .event .lifecycle .v1 .ClientTickEvents ;
1921import net .fabricmc .fabric .api .client .rendering .v1 .WorldRenderEvents ;
22+ import net .fabricmc .fabric .api .event .lifecycle .v1 .CommonLifecycleEvents ;
2023import net .fabricmc .fabric .api .resource .ResourceManagerHelper ;
2124import net .fabricmc .fabric .api .resource .SimpleSynchronousResourceReloadListener ;
2225import net .fabricmc .loader .api .FabricLoader ;
2831import net .minecraft .resources .Identifier ;
2932import net .minecraft .resources .io .ResourceManager ;
3033import net .minecraft .resources .io .ResourceType ;
31- import net .minecraft .util .math .MathHelper ;
3234import net .minecraft .world .entity .Entity ;
3335import net .minecraft .world .entity .LivingEntity ;
3436import net .minecraft .world .entity .item .PrimedTnt ;
3537import net .minecraft .world .entity .monster .Creeper ;
3638import net .minecraft .world .entity .player .Player ;
3739import net .minecraft .world .item .ItemStack ;
40+ import net .minecraft .world .level .BlockAndTintGetter ;
3841import org .jetbrains .annotations .NotNull ;
3942import org .jetbrains .annotations .Nullable ;
4043import org .slf4j .Logger ;
4144import org .slf4j .LoggerFactory ;
4245
46+ import java .util .ArrayList ;
4347import java .util .HashSet ;
48+ import java .util .List ;
4449import java .util .Set ;
4550import java .util .concurrent .locks .ReentrantReadWriteLock ;
4651import java .util .function .Predicate ;
4954 * Represents the LambDynamicLights mod.
5055 *
5156 * @author LambdAurora
52- * @version 3.0.1
57+ * @version 3.1.0
5358 * @since 1.0.0
5459 */
5560public class LambDynLights implements ClientModInitializer {
5661 private static final Logger LOGGER = LoggerFactory .getLogger ("LambDynamicLights" );
57- private static final double MAX_RADIUS = 7.75 ;
58- private static final double MAX_RADIUS_SQUARED = MAX_RADIUS * MAX_RADIUS ;
5962 public static final EventManager <Identifier > EVENT_MANAGER = new EventManager <>(Identifier .of (LambDynLightsConstants .NAMESPACE , "default" ), Identifier ::parse );
6063 private static LambDynLights INSTANCE ;
6164 public final DynamicLightsConfig config = new DynamicLightsConfig (this );
6265 public final ItemLightSources itemLightSources = new ItemLightSources ();
66+ private final DynamicLightingEngine engine = new DynamicLightingEngine ();
6367 private final Set <DynamicLightSource > dynamicLightSources = new HashSet <>();
68+ private final List <DynamicLightSource > toClear = new ArrayList <>();
6469 private final ReentrantReadWriteLock lightSourcesLock = new ReentrantReadWriteLock ();
6570 private long lastUpdate = System .currentTimeMillis ();
6671 private int lastUpdateCount = 0 ;
@@ -89,6 +94,18 @@ public void reload(ResourceManager manager) {
8994 }
9095 });
9196
97+ CommonLifecycleEvents .TAGS_LOADED .register ((registries , client ) -> {
98+ this .itemLightSources .apply (registries );
99+ });
100+
101+ ClientTickEvents .END_WORLD_TICK .register (level -> {
102+ this .lightSourcesLock .writeLock ().lock ();
103+ this .engine .computeSpatialLookup (this .dynamicLightSources );
104+ this .toClear .forEach (source -> source .lambdynlights$scheduleTrackedChunksRebuild (Minecraft .getInstance ().levelRenderer ));
105+ this .toClear .clear ();
106+ this .lightSourcesLock .writeLock ().unlock ();
107+ });
108+
92109 WorldRenderEvents .START .register (context -> {
93110 Minecraft .getInstance ().getProfiler ().swap ("dynamic_lighting" );
94111 this .updateAll (context .worldRenderer ());
@@ -111,11 +128,9 @@ public void updateAll(@NotNull LevelRenderer renderer) {
111128 this .lastUpdate = now ;
112129 this .lastUpdateCount = 0 ;
113130
114- this .lightSourcesLock .readLock ().lock ();
115131 for (var lightSource : this .dynamicLightSources ) {
116132 if (lightSource .lambdynlights$updateDynamicLight (renderer )) this .lastUpdateCount ++;
117133 }
118- this .lightSourcesLock .readLock ().unlock ();
119134 }
120135 }
121136
@@ -131,11 +146,12 @@ public int getLastUpdateCount() {
131146 /**
132147 * Returns the lightmap with combined light levels.
133148 *
149+ * @param level the level in which the light is computed
134150 * @param pos the position
135151 * @param lightmap the vanilla lightmap coordinates
136152 * @return the modified lightmap coordinates
137153 */
138- public int getLightmapWithDynamicLight (@ NotNull BlockPos pos , int lightmap ) {
154+ public int getLightmapWithDynamicLight (@ NotNull BlockAndTintGetter level , @ NotNull BlockPos pos , int lightmap ) {
139155 return this .getLightmapWithDynamicLight (this .getDynamicLightLevel (pos ), lightmap );
140156 }
141157
@@ -184,44 +200,10 @@ public int getLightmapWithDynamicLight(double dynamicLightLevel, int lightmap) {
184200 * @return the dynamic light level at the specified position
185201 */
186202 public double getDynamicLightLevel (@ NotNull BlockPos pos ) {
187- double result = 0 ;
188203 this .lightSourcesLock .readLock ().lock ();
189- for (var lightSource : this .dynamicLightSources ) {
190- result = maxDynamicLightLevel (pos , lightSource , result );
191- }
204+ double light = this .engine .getDynamicLightLevel (pos );
192205 this .lightSourcesLock .readLock ().unlock ();
193-
194- return MathHelper .clamp (result , 0 , 15 );
195- }
196-
197- /**
198- * Returns the dynamic light level generated by the light source at the specified position.
199- *
200- * @param pos the position
201- * @param lightSource the light source
202- * @param currentLightLevel the current surrounding dynamic light level
203- * @return the dynamic light level at the specified position
204- */
205- public static double maxDynamicLightLevel (@ NotNull BlockPos pos , @ NotNull DynamicLightSource lightSource , double currentLightLevel ) {
206- int luminance = lightSource .getLuminance ();
207- if (luminance > 0 ) {
208- // Can't use Entity#squaredDistanceTo because of eye Y coordinate.
209- double dx = pos .getX () - lightSource .getDynamicLightX () + 0.5 ;
210- double dy = pos .getY () - lightSource .getDynamicLightY () + 0.5 ;
211- double dz = pos .getZ () - lightSource .getDynamicLightZ () + 0.5 ;
212-
213- double distanceSquared = dx * dx + dy * dy + dz * dz ;
214- // 7.75 because else we would have to update more chunks and that's not a good idea.
215- // 15 (max range for blocks) would be too much and a bit cheaty.
216- if (distanceSquared <= MAX_RADIUS_SQUARED ) {
217- double multiplier = 1.0 - Math .sqrt (distanceSquared ) / MAX_RADIUS ;
218- double lightLevel = multiplier * (double ) luminance ;
219- if (lightLevel > currentLightLevel ) {
220- return lightLevel ;
221- }
222- }
223- }
224- return currentLightLevel ;
206+ return light ;
225207 }
226208
227209 /**
@@ -236,9 +218,7 @@ public void addLightSource(@NotNull DynamicLightSource lightSource) {
236218 return ;
237219 if (this .containsLightSource (lightSource ))
238220 return ;
239- this .lightSourcesLock .writeLock ().lock ();
240221 this .dynamicLightSources .add (lightSource );
241- this .lightSourcesLock .writeLock ().unlock ();
242222 }
243223
244224 /**
@@ -251,11 +231,7 @@ public boolean containsLightSource(@NotNull DynamicLightSource lightSource) {
251231 if (!lightSource .getDynamicLightLevel ().isClientSide ())
252232 return false ;
253233
254- boolean result ;
255- this .lightSourcesLock .readLock ().lock ();
256- result = this .dynamicLightSources .contains (lightSource );
257- this .lightSourcesLock .readLock ().unlock ();
258- return result ;
234+ return this .dynamicLightSources .contains (lightSource );
259235 }
260236
261237 /**
@@ -264,13 +240,7 @@ public boolean containsLightSource(@NotNull DynamicLightSource lightSource) {
264240 * @return the number of dynamic light sources emitting light
265241 */
266242 public int getLightSourcesCount () {
267- int result ;
268-
269- this .lightSourcesLock .readLock ().lock ();
270- result = this .dynamicLightSources .size ();
271- this .lightSourcesLock .readLock ().unlock ();
272-
273- return result ;
243+ return this .dynamicLightSources .size ();
274244 }
275245
276246 /**
@@ -279,39 +249,31 @@ public int getLightSourcesCount() {
279249 * @param lightSource the light source to remove
280250 */
281251 public void removeLightSource (@ NotNull DynamicLightSource lightSource ) {
282- this .lightSourcesLock .writeLock ().lock ();
283-
284252 var dynamicLightSources = this .dynamicLightSources .iterator ();
285253 DynamicLightSource it ;
286254 while (dynamicLightSources .hasNext ()) {
287255 it = dynamicLightSources .next ();
288256 if (it .equals (lightSource )) {
289257 dynamicLightSources .remove ();
290- lightSource . lambdynlights$scheduleTrackedChunksRebuild ( Minecraft . getInstance (). levelRenderer );
258+ this . toClear . add ( lightSource );
291259 break ;
292260 }
293261 }
294-
295- this .lightSourcesLock .writeLock ().unlock ();
296262 }
297263
298264 /**
299265 * Clears light sources.
300266 */
301267 public void clearLightSources () {
302- this .lightSourcesLock .writeLock ().lock ();
303-
304268 var dynamicLightSources = this .dynamicLightSources .iterator ();
305269 DynamicLightSource it ;
306270 while (dynamicLightSources .hasNext ()) {
307271 it = dynamicLightSources .next ();
308272 dynamicLightSources .remove ();
309273 if (it .getLuminance () > 0 )
310274 it .resetDynamicLight ();
311- it . lambdynlights$scheduleTrackedChunksRebuild ( Minecraft . getInstance (). levelRenderer );
275+ this . toClear . add ( it );
312276 }
313-
314- this .lightSourcesLock .writeLock ().unlock ();
315277 }
316278
317279 /**
@@ -320,8 +282,6 @@ public void clearLightSources() {
320282 * @param filter the removal filter
321283 */
322284 public void removeLightSources (@ NotNull Predicate <DynamicLightSource > filter ) {
323- this .lightSourcesLock .writeLock ().lock ();
324-
325285 var dynamicLightSources = this .dynamicLightSources .iterator ();
326286 DynamicLightSource it ;
327287 while (dynamicLightSources .hasNext ()) {
@@ -330,12 +290,10 @@ public void removeLightSources(@NotNull Predicate<DynamicLightSource> filter) {
330290 dynamicLightSources .remove ();
331291 if (it .getLuminance () > 0 )
332292 it .resetDynamicLight ();
333- it . lambdynlights$scheduleTrackedChunksRebuild ( Minecraft . getInstance (). levelRenderer );
293+ this . toClear . add ( it );
334294 break ;
335295 }
336296 }
337-
338- this .lightSourcesLock .writeLock ().unlock ();
339297 }
340298
341299 /**
0 commit comments