From 3c9353e143d4733199efb0cde115b4dadc4fc018 Mon Sep 17 00:00:00 2001 From: Caedis Date: Wed, 26 Jun 2024 07:39:26 -0500 Subject: [PATCH] Update dynamic lights from beta branch (#534) * move dynamic lights lang to angelica * No light when in water * update bs * add battlegear2 compat Can't add backhand compat since it shares api package path with battlegear2 (mods/battlegear2/api/core/BattlegearUtils) * Add backhand 1.4.1+ support --- dependencies.gradle | 3 ++ settings.gradle | 2 +- .../angelica/compat/ModStatus.java | 12 +++++++ .../angelica/dynamiclights/DynamicLights.java | 35 ++++++++++++++++--- .../resources/assets/angelica/lang/en_US.lang | 2 ++ 5 files changed, 49 insertions(+), 5 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 724908388..d4a7b9e1b 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -78,6 +78,9 @@ dependencies { compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.12.0-GTNH:dev") compileOnly("com.github.GTNewHorizons:Natura:2.6.1:dev") + compileOnly("com.github.GTNewHorizons:Battlegear2:1.4.0:dev") { transitive = false } + compileOnly(rfg.deobf('maven.modrinth:backhand:1.4.1')) { transitive = false } + compileOnly("com.falsepattern:chunkapi-mc1.7.10:0.5.1:api") { transitive = false } compileOnly("com.falsepattern:endlessids-mc1.7.10:1.5-beta0003:dev") { transitive = false } diff --git a/settings.gradle b/settings.gradle index 0fa716722..7540d8b9e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -16,5 +16,5 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.21' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.23' } diff --git a/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java index 85bb6f835..7ef4c3c8b 100644 --- a/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java +++ b/src/main/java/com/gtnewhorizons/angelica/compat/ModStatus.java @@ -5,6 +5,7 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import net.dries007.holoInventory.HoloInventory; +import xonin.backhand.Backhand; public class ModStatus { /** @@ -23,6 +24,8 @@ public class ModStatus { public static boolean isEIDBiomeLoaded; public static boolean isXaerosMinimapLoaded; public static boolean isHoloInventoryLoaded; + public static boolean isBattlegearLoaded; + public static boolean isBackhandLoaded; public static void preInit(){ isBetterCrashesLoaded = Loader.isModLoaded("bettercrashes"); @@ -33,6 +36,8 @@ public class ModStatus { isEIDBiomeLoaded = Loader.isModLoaded("endlessids_biome"); isXaerosMinimapLoaded = Loader.isModLoaded("XaeroMinimap"); isHoloInventoryLoaded = Loader.isModLoaded("holoinventory"); + isBattlegearLoaded = Loader.isModLoaded("battlegear2"); + isBackhandLoaded = Loader.isModLoaded("backhand"); if (isHoloInventoryLoaded){ isHoloInventoryLoaded = new DefaultArtifactVersion("2.4.4-GTNH") @@ -41,6 +46,13 @@ public class ModStatus { ) <= 0; } + if (isBackhandLoaded){ + isBackhandLoaded = new DefaultArtifactVersion("1.4.1") + .compareTo( + LoadControllerHelper.getOwningMod(Backhand.class).getProcessedVersion() + ) <= 0; + } + isNEIDMetadataExtended = false; if (isNEIDLoaded) { diff --git a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java index 634a4261c..63dffc098 100644 --- a/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java +++ b/src/main/java/com/gtnewhorizons/angelica/dynamiclights/DynamicLights.java @@ -1,15 +1,21 @@ package com.gtnewhorizons.angelica.dynamiclights; import com.gtnewhorizons.angelica.api.BlockPos; +import com.gtnewhorizons.angelica.compat.ModStatus; import com.gtnewhorizons.angelica.compat.mojang.BlockPosImpl; import com.gtnewhorizons.angelica.config.AngelicaConfig; import it.unimi.dsi.fastutil.longs.LongOpenHashSet; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer; +import mods.battlegear2.api.core.IBattlePlayer; +import mods.battlegear2.api.core.IInventoryPlayerBattle; +import net.irisshaders.iris.api.v0.IrisApi; import net.minecraft.block.Block; +import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -18,8 +24,9 @@ import net.minecraft.item.ItemStack; import net.minecraft.util.MathHelper; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import xonin.backhand.api.core.BackhandUtils; +import xonin.backhand.api.core.IBackhandPlayer; -import java.util.HashSet; import java.util.Set; import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.function.Predicate; @@ -319,6 +326,9 @@ public class DynamicLights { * @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; + Item item = stack.getItem(); if (item instanceof ItemBlock itemBlock) { Block block = itemBlock.field_150939_a; @@ -337,15 +347,15 @@ public class DynamicLights { if (entity.fire > 0) return 15; if (entity instanceof EntityItem item) { - return getLuminanceFromItemStack(item.getEntityItem(), item.isInWater()); + return getLuminanceFromItemStack(item.getEntityItem(), item.isInsideOfMaterial(Material.water)); } if (entity instanceof EntityLivingBase living) { int luminance = 0; - boolean inWater = living.isInWater(); + boolean inWater = living.isInsideOfMaterial(Material.water); - // check equipment + hand for light + // 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) { @@ -353,6 +363,23 @@ public class DynamicLights { } } + if (ModStatus.isBattlegearLoaded && + living instanceof EntityPlayer player && + player instanceof IBattlePlayer battlePlayer && + battlePlayer.battlegear2$isBattlemode() + ) { + ItemStack offhand = ((IInventoryPlayerBattle) player.inventory).battlegear2$getCurrentOffhandWeapon(); + if (offhand != null) { + luminance = Math.max(luminance, getLuminanceFromItemStack(offhand, inWater)); + } + } + else if (ModStatus.isBackhandLoaded && living instanceof EntityPlayer player){ + ItemStack offhand = BackhandUtils.getOffhandItem(player); + if (offhand != null) { + luminance = Math.max(luminance, getLuminanceFromItemStack(offhand, inWater)); + } + } + return luminance; } diff --git a/src/main/resources/assets/angelica/lang/en_US.lang b/src/main/resources/assets/angelica/lang/en_US.lang index 492e3d588..529535131 100644 --- a/src/main/resources/assets/angelica/lang/en_US.lang +++ b/src/main/resources/assets/angelica/lang/en_US.lang @@ -126,6 +126,8 @@ options.iris.shadowDistance.enabled=Allows you to change the maximum distance fo options.iris.shadowDistance.disabled=Your current shader pack has already set a render distance for shadows; you cannot change it. options.iris.gui.hide=Hide GUI 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 - no delay pack.iris.select.title=Select pack.iris.configure.title=Configure label.iris.true=On