diff options
| -rw-r--r-- | src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt | 6 | ||||
| -rw-r--r-- | src/main/kotlin/moe/nea/firmament/features/world/FairySouls.kt | 4 | ||||
| -rw-r--r-- | src/main/kotlin/moe/nea/firmament/util/render/RenderInWorldContext.kt (renamed from src/main/kotlin/moe/nea/firmament/util/render/block.kt) | 8 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt b/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt index 24e31ea..fa8d779 100644 --- a/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt +++ b/src/main/kotlin/moe/nea/firmament/features/fishing/FishingWarning.kt @@ -25,8 +25,6 @@ import kotlin.math.asin import kotlin.math.atan2 import kotlin.math.sqrt import kotlin.time.Duration.Companion.seconds -import net.minecraft.client.render.VertexConsumerProvider -import net.minecraft.client.render.VertexConsumers import net.minecraft.entity.projectile.FishingBobberEntity import net.minecraft.particle.ParticleTypes import net.minecraft.util.math.Vec3d @@ -37,7 +35,7 @@ import moe.nea.firmament.features.FirmamentFeature import moe.nea.firmament.gui.config.ManagedConfig import moe.nea.firmament.util.MC import moe.nea.firmament.util.TimeMark -import moe.nea.firmament.util.render.RenderBlockContext.Companion.renderBlocks +import moe.nea.firmament.util.render.RenderInWorldContext.Companion.renderInWorld object FishingWarning : FirmamentFeature { override val name: String @@ -139,7 +137,7 @@ object FishingWarning : FirmamentFeature { WorldRenderLastEvent.subscribe { recentParticles.removeIf { it.second.passedTime() > 5.seconds } recentCandidates.removeIf { it.timeMark.passedTime() > 5.seconds } - renderBlocks(it.matrices, it.camera) { + renderInWorld(it.matrices, it.camera) { color(0f, 0f, 1f, 1f) recentParticles.forEach { tinyBlock(it.first, 0.1F) diff --git a/src/main/kotlin/moe/nea/firmament/features/world/FairySouls.kt b/src/main/kotlin/moe/nea/firmament/features/world/FairySouls.kt index 318365c..9a04b37 100644 --- a/src/main/kotlin/moe/nea/firmament/features/world/FairySouls.kt +++ b/src/main/kotlin/moe/nea/firmament/features/world/FairySouls.kt @@ -31,7 +31,7 @@ import moe.nea.firmament.util.SBData import moe.nea.firmament.util.blockPos import moe.nea.firmament.gui.config.ManagedConfig import moe.nea.firmament.util.data.ProfileSpecificDataHolder -import moe.nea.firmament.util.render.RenderBlockContext.Companion.renderBlocks +import moe.nea.firmament.util.render.RenderInWorldContext.Companion.renderInWorld import moe.nea.firmament.util.unformattedString @@ -127,7 +127,7 @@ object FairySouls : FirmamentFeature { } WorldRenderLastEvent.subscribe { if (!TConfig.displaySouls) return@subscribe - renderBlocks(it.matrices, it.camera) { + renderInWorld(it.matrices, it.camera) { color(1F, 1F, 0F, 0.8F) currentMissingSouls.forEach { block(it.blockPos) diff --git a/src/main/kotlin/moe/nea/firmament/util/render/block.kt b/src/main/kotlin/moe/nea/firmament/util/render/RenderInWorldContext.kt index 7df610b..59a949a 100644 --- a/src/main/kotlin/moe/nea/firmament/util/render/block.kt +++ b/src/main/kotlin/moe/nea/firmament/util/render/RenderInWorldContext.kt @@ -24,16 +24,14 @@ import net.minecraft.client.gl.VertexBuffer import net.minecraft.client.render.BufferBuilder import net.minecraft.client.render.Camera import net.minecraft.client.render.GameRenderer -import net.minecraft.client.render.RenderLayer import net.minecraft.client.render.Tessellator -import net.minecraft.client.render.VertexConsumerProvider import net.minecraft.client.render.VertexFormat import net.minecraft.client.render.VertexFormats import net.minecraft.client.util.math.MatrixStack import net.minecraft.util.math.BlockPos import net.minecraft.util.math.Vec3d -class RenderBlockContext private constructor(private val tesselator: Tessellator, private val matrixStack: MatrixStack) { +class RenderInWorldContext private constructor(private val tesselator: Tessellator, private val matrixStack: MatrixStack) { private val buffer = tesselator.buffer fun color(red: Float, green: Float, blue: Float, alpha: Float) { @@ -105,7 +103,7 @@ class RenderBlockContext private constructor(private val tesselator: Tessellator buf.unfixColor() } - fun renderBlocks(matrices: MatrixStack, camera: Camera, block: RenderBlockContext. () -> Unit) { + fun renderInWorld(matrices: MatrixStack, camera: Camera, block: RenderInWorldContext. () -> Unit) { RenderSystem.disableDepthTest() RenderSystem.enableBlend() RenderSystem.defaultBlendFunc() @@ -114,7 +112,7 @@ class RenderBlockContext private constructor(private val tesselator: Tessellator matrices.push() matrices.translate(-camera.pos.x, -camera.pos.y, -camera.pos.z) - val ctx = RenderBlockContext(Tessellator.getInstance(), matrices) + val ctx = RenderInWorldContext(Tessellator.getInstance(), matrices) block(ctx) matrices.pop() |