diff options
| author | NopoTheGamer <40329022+NopoTheGamer@users.noreply.github.com> | 2023-08-05 23:16:34 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-05 15:16:34 +0200 |
| commit | 2c33629da66bcef0a9300a737f4493eadb5c1b41 (patch) | |
| tree | 51c69dfe4713a852b6db4fa3860f927b6f17238a /src/main/java/io | |
| parent | 3c9e4c7c1874bee803ad8c241fff83fd5588cda8 (diff) | |
| download | NotEnoughUpdates-2c33629da66bcef0a9300a737f4493eadb5c1b41.tar.gz NotEnoughUpdates-2c33629da66bcef0a9300a737f4493eadb5c1b41.tar.bz2 NotEnoughUpdates-2c33629da66bcef0a9300a737f4493eadb5c1b41.zip | |
Allow world render to use players alpha config value (#783)
* made it so world render uses your set alpha value
* reset config (sad trombone)
Diffstat (limited to 'src/main/java/io')
5 files changed, 7 insertions, 8 deletions
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/util/render/RenderUtils.java b/src/main/java/io/github/moulberry/notenoughupdates/core/util/render/RenderUtils.java index cedc12d7..b3a84c52 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/core/util/render/RenderUtils.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/core/util/render/RenderUtils.java @@ -40,7 +40,6 @@ import net.minecraft.util.MathHelper; import net.minecraft.util.ResourceLocation; import net.minecraft.util.Vec3; import net.minecraft.util.Vec3i; -import net.minecraftforge.client.event.RenderWorldLastEvent; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL14; import org.lwjgl.util.vector.Vector3f; @@ -329,7 +328,7 @@ public class RenderUtils { GlStateManager.disableDepth(); GlStateManager.disableCull(); GlStateManager.disableTexture2D(); - CustomItemEffects.drawFilledBoundingBox(bb, 1f, SpecialColour.special(0, 100, rgb)); + CustomItemEffects.drawFilledBoundingBox(bb, 1f, SpecialColour.special(0, (rgb >> 24) & 0xFF, rgb)); GlStateManager.enableTexture2D(); GlStateManager.enableCull(); GlStateManager.enableDepth(); diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/EnderNodeHighlighter.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/EnderNodeHighlighter.java index 51fc950c..856b60a6 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/EnderNodeHighlighter.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/EnderNodeHighlighter.java @@ -94,6 +94,6 @@ public class EnderNodeHighlighter extends GenericBlockHighlighter { @Override protected int getColor(BlockPos blockPos) { - return SpecialColour.specialToChromaRGB(NotEnoughUpdates.INSTANCE.config.world.enderNodeColor); + return SpecialColour.specialToChromaRGB(NotEnoughUpdates.INSTANCE.config.world.enderNodeColor2); } } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/FrozenTreasuresHighlighter.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/FrozenTreasuresHighlighter.java index c3b49dc7..b4b6fa8c 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/FrozenTreasuresHighlighter.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/FrozenTreasuresHighlighter.java @@ -121,6 +121,6 @@ public class FrozenTreasuresHighlighter extends GenericBlockHighlighter { @Override protected int getColor(BlockPos blockPos) { - return SpecialColour.specialToChromaRGB(NotEnoughUpdates.INSTANCE.config.world.frozenTreasuresColor); + return SpecialColour.specialToChromaRGB(NotEnoughUpdates.INSTANCE.config.world.frozenTreasuresColor2); } } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/GlowingMushroomHighlighter.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/GlowingMushroomHighlighter.java index 17f5f527..640a2946 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/GlowingMushroomHighlighter.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/world/GlowingMushroomHighlighter.java @@ -68,7 +68,7 @@ public class GlowingMushroomHighlighter extends GenericBlockHighlighter { @Override protected int getColor(BlockPos blockPos) { - return SpecialColour.specialToChromaRGB(NotEnoughUpdates.INSTANCE.config.world.glowingMushroomColor); + return SpecialColour.specialToChromaRGB(NotEnoughUpdates.INSTANCE.config.world.glowingMushroomColor2); } } diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/WorldConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/WorldConfig.java index fa39c2ef..e509634e 100644 --- a/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/WorldConfig.java +++ b/src/main/java/io/github/moulberry/notenoughupdates/options/seperateSections/WorldConfig.java @@ -52,7 +52,7 @@ public class WorldConfig { ) @ConfigEditorColour @ConfigAccordionId(id = 1) - public String glowingMushroomColor = "0:255:142:88:36"; + public String glowingMushroomColor2 = "0:100:142:88:36"; @Expose @ConfigOption( @@ -78,7 +78,7 @@ public class WorldConfig { ) @ConfigEditorColour @ConfigAccordionId(id = 2) - public String enderNodeColor = "0:255:0:255:0"; + public String enderNodeColor2 = "0:100:0:255:0"; @Expose @ConfigOption( @@ -104,6 +104,6 @@ public class WorldConfig { ) @ConfigEditorColour @ConfigAccordionId(id = 3) - public String frozenTreasuresColor = "0:255:0:255:0"; + public String frozenTreasuresColor2 = "0:100:0:255:0"; } |