Skip to content

Commit

Permalink
Check curios slots for radiation shielding (#8216)
Browse files Browse the repository at this point in the history
  • Loading branch information
blockgoblin31 authored and pupnewfster committed Aug 25, 2024
1 parent 9cc8430 commit 4c2468e
Showing 1 changed file with 18 additions and 0 deletions.
18 changes: 18 additions & 0 deletions src/main/java/mekanism/common/lib/radiation/RadiationManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@
import mekanism.api.radiation.capability.IRadiationShielding;
import mekanism.api.text.EnumColor;
import mekanism.api.text.ITooltipHelper;
import mekanism.common.Mekanism;
import mekanism.common.capabilities.Capabilities;
import mekanism.common.config.MekanismConfig;
import mekanism.common.integration.curios.CuriosIntegration;
import mekanism.common.lib.MekanismSavedData;
import mekanism.common.lib.collection.HashList;
import mekanism.common.network.to_client.radiation.PacketEnvironmentalRadiationData;
Expand Down Expand Up @@ -68,6 +70,7 @@
import net.minecraft.world.level.Level;
import net.neoforged.bus.api.SubscribeEvent;
import net.neoforged.neoforge.event.tick.EntityTickEvent;
import net.neoforged.neoforge.items.IItemHandler;
import net.neoforged.neoforge.network.PacketDistributor;
import net.neoforged.neoforge.server.ServerLifecycleHooks;
import org.jetbrains.annotations.NotNull;
Expand Down Expand Up @@ -339,6 +342,21 @@ private double getRadiationResistance(LivingEntity entity) {
}
}
}
if (resistance < 1 && Mekanism.hooks.CuriosLoaded) {
IItemHandler handler = CuriosIntegration.getCuriosInventory(entity);
if (handler != null) {
for (int i = 0, slots = handler.getSlots(); i < slots; i++) {
ItemStack stack = handler.getStackInSlot(i);
IRadiationShielding shielding = stack.getCapability(Capabilities.RADIATION_SHIELDING);
if (shielding != null) {
resistance += shielding.getRadiationShielding();
if (resistance >= 1) {
return 1;
}
}
}
}
}
return resistance;
}

Expand Down

0 comments on commit 4c2468e

Please sign in to comment.