Merge pull request Creators-of-Create#5606 from Robocraft999/patch-1

generalized getFogDensity and checking for armor in NetheriteDivingHandler
Blazified · Oct 22, 2023 · 0d6d4b7 · 0d6d4b7
2 parents 8672231 + 8078535
commit 0d6d4b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/main/java/com/simibubi/create/content/equipment/armor/NetheriteDivingHandler.java b/src/main/java/com/simibubi/create/content/equipment/armor/NetheriteDivingHandler.java
@@ -1,7 +1,5 @@
 package com.simibubi.create.content.equipment.armor;
 
-import com.simibubi.create.AllItems;
-
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.entity.LivingEntity;
@@ -28,13 +26,13 @@ public static void onLivingEquipmentChange(LivingEquipmentChangeEvent event) {
 		ItemStack to = event.getTo();
 
 		if (slot == EquipmentSlot.HEAD) {
-			if (AllItems.NETHERITE_DIVING_HELMET.isIn(to)) {
+			if (to.getItem() instanceof DivingHelmetItem && isNetheriteArmor(to)) {
 				setBit(entity, slot);
 			} else {
 				clearBit(entity, slot);
 			}
 		} else if (slot == EquipmentSlot.CHEST) {
-			if (AllItems.NETHERITE_BACKTANK.isIn(to) && BacktankUtil.hasAirRemaining(to)) {
+			if (to.getItem() instanceof BacktankItem && isNetheriteArmor(to) && BacktankUtil.hasAirRemaining(to)) {
 				setBit(entity, slot);
 			} else {
 				clearBit(entity, slot);

diff --git a/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java b/src/main/java/com/simibubi/create/foundation/events/ClientEvents.java
@@ -19,6 +19,7 @@
 import com.simibubi.create.content.equipment.armor.BacktankArmorLayer;
 import com.simibubi.create.content.equipment.armor.DivingHelmetItem;
 import com.simibubi.create.content.equipment.armor.NetheriteBacktankFirstPersonRenderer;
+import com.simibubi.create.content.equipment.armor.NetheriteDivingHandler;
 import com.simibubi.create.content.equipment.blueprint.BlueprintOverlayRenderer;
 import com.simibubi.create.content.equipment.clipboard.ClipboardValueSettingsHandler;
 import com.simibubi.create.content.equipment.extendoGrip.ExtendoGripRenderHandler;
@@ -316,7 +317,7 @@ public static void getFogDensity(EntityViewRenderEvent.RenderFogEvent event) {
 				event.scaleFarPlaneDistance(6.25f);
 				event.setCanceled(true);
 				return;
-			} else if (FluidHelper.isLava(fluid) && AllItems.NETHERITE_DIVING_HELMET.isIn(divingHelmet)) {
+			} else if (FluidHelper.isLava(fluid) && NetheriteDivingHandler.isNetheriteArmor(divingHelmet)) {
 				event.setNearPlaneDistance(-4.0f);
 				event.setFarPlaneDistance(20.0f);
 				event.setCanceled(true);