Skip to content

Commit 8a8025e

Browse files
authored
Merge pull request #161 from FakeDomi/1.20
Make fission glass not block light in AO calculation, hide radiation tooltips when radiation is disabled
2 parents 6321b5c + 73fbc50 commit 8a8025e

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

src/main/java/igentuman/nc/block/fission/FissionCasingBlock.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ public boolean propagatesSkylightDown(BlockState pState, BlockGetter pLevel, Blo
2323
return asItem().toString().matches(".*glass");
2424
}
2525

26+
@Override
27+
public float getShadeBrightness(BlockState pState, BlockGetter pLevel, BlockPos pPos) {
28+
return asItem().toString().matches(".*glass") ? 1.0F : 0.2F;
29+
}
30+
2631
@Override
2732
@Deprecated
2833
public boolean skipRendering(@NotNull BlockState state, @NotNull BlockState adjacentBlockState, @NotNull Direction side) {

src/main/java/igentuman/nc/handler/event/client/TooltipHandler.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package igentuman.nc.handler.event.client;
22

3+
import igentuman.nc.handler.config.RadiationConfig;
34
import igentuman.nc.multiblock.fission.FissionBlocks;
45
import igentuman.nc.radiation.ItemRadiation;
56
import igentuman.nc.radiation.ItemShielding;
@@ -36,9 +37,11 @@ public static void handle(ItemTooltipEvent event) {
3637
processedEvent = event;
3738
Item item = event.getItemStack().getItem();
3839
miscTooltips(event, event.getItemStack());
39-
addRadiationLevelTooltip(event, item);
40-
addShieldingTooltip(event, event.getItemStack());
41-
addRadiationCleaningEffect(event, event.getItemStack());
40+
if(RadiationConfig.RADIATION_CONFIG.ENABLED.get()) {
41+
addRadiationLevelTooltip(event, item);
42+
addShieldingTooltip(event, event.getItemStack());
43+
addRadiationCleaningEffect(event, event.getItemStack());
44+
}
4245
addModeratorTooltip(event, event.getItemStack());
4346
}
4447

0 commit comments

Comments
 (0)