Ellpeck/NaturesAura
1
0
Fork 0
mirror of https://github.com/Ellpeck/NaturesAura.git synced 2024-06-21 02:49:11 +02:00
Code Issues Projects Releases Wiki Activity

added back in-world rendering

Browse source
This commit is contained in:
Ell 2021-12-20 00:49:38 +01:00
parent 29b067d294
commit 82384dc1e7
2 changed files with 103 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/de/ellpeck/naturesaura/Helper.java
View file

@ -1,6 +1,7 @@
package de.ellpeck.naturesaura; package de.ellpeck.naturesaura;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.VertexConsumer;
import de.ellpeck.naturesaura.api.NaturesAuraAPI; import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.container.IAuraContainer; import de.ellpeck.naturesaura.api.aura.container.IAuraContainer;
import de.ellpeck.naturesaura.api.aura.item.IAuraRecharge; import de.ellpeck.naturesaura.api.aura.item.IAuraRecharge;
@ -130,6 +131,34 @@ public final class Helper {
RenderSystem.applyModelViewMatrix(); RenderSystem.applyModelViewMatrix();
} }
@OnlyIn(Dist.CLIENT)
public static void renderWeirdBox(VertexConsumer buffer, double x, double y, double z, double width, double height, double depth, float r, float g, float b, float a) {
buffer.vertex(x, y + height, z).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y + height, z).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y, z).color(r, g, b, a).endVertex();
buffer.vertex(x, y, z).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y, z).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y + height, z).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y + height, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y + height, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x, y + height, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x, y, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x, y + height, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x, y + height, z).color(r, g, b, a).endVertex();
buffer.vertex(x, y, z).color(r, g, b, a).endVertex();
buffer.vertex(x, y, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x, y + height, z).color(r, g, b, a).endVertex();
buffer.vertex(x, y + height, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y + height, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y + height, z).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y, z).color(r, g, b, a).endVertex();
buffer.vertex(x + width, y, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x, y, z + depth).color(r, g, b, a).endVertex();
buffer.vertex(x, y, z).color(r, g, b, a).endVertex();
}
public static InteractionResult putStackOnTile(Player player, InteractionHand hand, BlockPos pos, int slot, boolean sound) { public static InteractionResult putStackOnTile(Player player, InteractionHand hand, BlockPos pos, int slot, boolean sound) {
var tile = player.level.getBlockEntity(pos); var tile = player.level.getBlockEntity(pos);
if (tile instanceof BlockEntityImpl) { if (tile instanceof BlockEntityImpl) {

145
src/main/java/de/ellpeck/naturesaura/events/ClientEvents.java
View file

@ -2,7 +2,8 @@ package de.ellpeck.naturesaura.events;
import com.mojang.blaze3d.platform.Window; import com.mojang.blaze3d.platform.Window;
import com.mojang.blaze3d.systems.RenderSystem; import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.PoseStack; import com.mojang.blaze3d.vertex.*;
import com.mojang.math.Vector3d;
import de.ellpeck.naturesaura.Helper; import de.ellpeck.naturesaura.Helper;
import de.ellpeck.naturesaura.ModConfig; import de.ellpeck.naturesaura.ModConfig;
import de.ellpeck.naturesaura.NaturesAura; import de.ellpeck.naturesaura.NaturesAura;
@ -10,6 +11,7 @@ import de.ellpeck.naturesaura.api.NaturesAuraAPI;
import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk; import de.ellpeck.naturesaura.api.aura.chunk.IAuraChunk;
import de.ellpeck.naturesaura.api.aura.container.IAuraContainer; import de.ellpeck.naturesaura.api.aura.container.IAuraContainer;
import de.ellpeck.naturesaura.api.aura.type.IAuraType; import de.ellpeck.naturesaura.api.aura.type.IAuraType;
import de.ellpeck.naturesaura.api.render.IVisualizable;
import de.ellpeck.naturesaura.blocks.tiles.*; import de.ellpeck.naturesaura.blocks.tiles.*;
import de.ellpeck.naturesaura.items.ItemAuraCache; import de.ellpeck.naturesaura.items.ItemAuraCache;
import de.ellpeck.naturesaura.items.ItemRangeVisualizer; import de.ellpeck.naturesaura.items.ItemRangeVisualizer;
@ -25,14 +27,16 @@ import net.minecraft.core.BlockPos;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.util.Tuple; import net.minecraft.util.Tuple;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import net.minecraft.world.level.block.Blocks; import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.BonemealableBlock; import net.minecraft.world.level.block.*;
import net.minecraft.world.level.block.LeavesBlock; import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.MyceliumBlock;
import net.minecraft.world.level.levelgen.Heightmap; import net.minecraft.world.level.levelgen.Heightmap;
import net.minecraft.world.phys.AABB;
import net.minecraft.world.phys.BlockHitResult; import net.minecraft.world.phys.BlockHitResult;
import net.minecraft.world.phys.Vec3;
import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.RenderGameOverlayEvent;
@ -61,6 +65,7 @@ public class ClientEvents {
private static ItemStack heldCache = ItemStack.EMPTY; private static ItemStack heldCache = ItemStack.EMPTY;
private static ItemStack heldEye = ItemStack.EMPTY; private static ItemStack heldEye = ItemStack.EMPTY;
private static ItemStack heldOcular = ItemStack.EMPTY; private static ItemStack heldOcular = ItemStack.EMPTY;
private static BlockPos hoveringAuraSpot;
@SubscribeEvent @SubscribeEvent
public void onDebugRender(RenderGameOverlayEvent.Text event) { public void onDebugRender(RenderGameOverlayEvent.Text event) {
@ -160,91 +165,82 @@ public class ClientEvents {
@SubscribeEvent @SubscribeEvent
public void onLevelRender(RenderLevelLastEvent event) { public void onLevelRender(RenderLevelLastEvent event) {
// TODO GL-based in-world rendering var mc = Minecraft.getInstance();
/* Minecraft mc = Minecraft.getInstance(); var view = mc.gameRenderer.getMainCamera().getPosition();
var tesselator = Tesselator.getInstance();
var buffer = tesselator.getBuilder();
RenderSystem.pushMatrix(); mc.getProfiler().push(NaturesAura.MOD_ID + ":onLevelRender");
RenderSystem.multMatrix(event.getMatrixStack().getLast().getMatrix());
ActiveRenderInfo info = mc.gameRenderer.getActiveRenderInfo(); RenderSystem.enableDepthTest();
Vector3d view = info.getProjectedView(); var mv = RenderSystem.getModelViewStack();
GL11.glTranslated(-view.getX(), -view.getY(), -view.getZ()); mv.pushPose();
mv.mulPoseMatrix(event.getPoseStack().last().pose());
mv.translate(-view.x, -view.y, -view.z);
RenderSystem.applyModelViewMatrix();
RenderSystem.enableBlend();
if (mc.gameSettings.showDebugInfo && mc.player.isCreative() && ModConfig.instance.debugLevel.get()) { // aura spot debug
Map<BlockPos, Integer> spots = new HashMap<>(); hoveringAuraSpot = null;
GL11.glPushMatrix(); if (mc.options.renderDebug && mc.player.isCreative() && ModConfig.instance.debugLevel.get()) {
GL11.glDisable(GL11.GL_DEPTH_TEST); var playerEye = mc.player.getEyePosition(event.getPartialTick());
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); var playerView = mc.player.getViewVector(event.getPartialTick()).normalize();
GL11.glDisable(GL11.GL_TEXTURE_2D); var range = mc.gameMode.getPickRange();
GL11.glEnable(GL11.GL_BLEND); buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
GL11.glBegin(GL11.GL_QUADS); IAuraChunk.getSpotsInArea(mc.level, mc.player.blockPosition(), 64, (pos, spot) -> {
IAuraChunk.getSpotsInArea(mc.level, mc.player.getPosition(), 64, (pos, spot) -> { Helper.renderWeirdBox(buffer, pos.getX(), pos.getY(), pos.getZ(), 1, 1, 1, spot > 0 ? 0F : 1F, spot > 0 ? 1F : 0F, 0F, 0.35F);
spots.put(pos, spot); // dirty raytrace to see if we're looking at roughly this spot
if (playerEye.distanceToSqr(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5) <= range * range) {
for (var d = 0F; d <= range; d += 0.5F) {
if (pos.equals(new BlockPos(playerEye.add(playerView.scale(d))))) {
hoveringAuraSpot = pos;
break;
}
}
}
RenderSystem.color4f(spot > 0 ? 0F : 1F, spot > 0 ? 1F : 0F, 0F, 0.35F);
Helper.renderWeirdBox(pos.getX(), pos.getY(), pos.getZ(), 1, 1, 1);
}); });
GL11.glEnd(); tesselator.end();
GL11.glPopAttrib();
float scale = 0.03F;
NumberFormat format = NumberFormat.getInstance();
RenderSystem.scalef(scale, scale, scale);
for (Map.Entry<BlockPos, Integer> spot : spots.entrySet()) {
BlockPos pos = spot.getKey();
RenderSystem.pushMatrix();
RenderSystem.translated((pos.getX() + 0.1) / scale, (pos.getY() + 1.001) / scale, (pos.getZ() + 0.1) / scale);
RenderSystem.rotatef(90F, 1F, 0F, 0F);
RenderSystem.scalef(0.65F, 0.65F, 0.65F);
mc.fontRenderer.drawString(new MatrixStack(), format.format(spot.getValue()), 0, 0, 0);
RenderSystem.popMatrix();
}
GL11.glEnable(GL11.GL_DEPTH_TEST);
GL11.glPopMatrix();
} }
// range visualizer
if (Helper.isHoldingItem(mc.player, ModItems.RANGE_VISUALIZER)) { if (Helper.isHoldingItem(mc.player, ModItems.RANGE_VISUALIZER)) {
RegistryKey<Level> dim = mc.level.func_234923_W_(); RenderSystem.disableCull();
GL11.glPushMatrix(); var dim = mc.level.dimension().location();
GL11.glDisable(GL11.GL_CULL_FACE); buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS); for (var pos : ItemRangeVisualizer.VISUALIZED_BLOCKS.get(dim)) {
GL11.glDisable(GL11.GL_TEXTURE_2D); if (!mc.level.isLoaded(pos))
GL11.glEnable(GL11.GL_BLEND);
GL11.glBegin(GL11.GL_QUADS);
for (BlockPos pos : ItemRangeVisualizer.VISUALIZED_BLOCKS.get(dim.func_240901_a_())) {
if (!mc.level.isBlockLoaded(pos))
continue; continue;
BlockState state = mc.level.getBlockState(pos); var state = mc.level.getBlockState(pos);
Block block = state.getBlock(); var block = state.getBlock();
if (!(block instanceof IVisualizable)) if (!(block instanceof IVisualizable))
continue; continue;
this.renderVisualize((IVisualizable) block, mc.level, pos); this.renderVisualize(buffer, (IVisualizable) block, mc.level, pos);
} }
for (Entity entity : ItemRangeVisualizer.VISUALIZED_ENTITIES.get(dim.func_240901_a_())) { for (var entity : ItemRangeVisualizer.VISUALIZED_ENTITIES.get(dim)) {
if (!entity.isAlive() || !(entity instanceof IVisualizable)) if (!entity.isAlive() || !(entity instanceof IVisualizable))
continue; continue;
this.renderVisualize((IVisualizable) entity, mc.level, entity.getPosition()); this.renderVisualize(buffer, (IVisualizable) entity, mc.level, entity.blockPosition());
} }
GL11.glEnd(); tesselator.end();
GL11.glPopAttrib(); RenderSystem.enableCull();
GL11.glEnable(GL11.GL_CULL_FACE);
GL11.glPopMatrix();
} }
GL11.glPopMatrix();*/ mv.popPose();
RenderSystem.applyModelViewMatrix();
RenderSystem.disableBlend();
mc.getProfiler().pop();
} }
/* private void renderVisualize(IVisualizable visualize, Level private void renderVisualize(BufferBuilder buffer, IVisualizable visualize, Level level, BlockPos pos) {
level, BlockPos pos) { var box = visualize.getVisualizationBounds(level, pos);
AABB box = visualize.getVisualizationBounds(level, pos); if (box != null) {
if (box == null) box = box.inflate(0.05F);
return; var color = visualize.getVisualizationColor(level, pos);
box = box.grow(0.05F); Helper.renderWeirdBox(buffer, box.minX, box.minY, box.minZ, box.maxX - box.minX, box.maxY - box.minY, box.maxZ - box.minZ, (color >> 16 & 255) / 255F, (color >> 8 & 255) / 255F, (color & 255) / 255F, 0.5F);
int color = visualize.getVisualizationColor(level, pos); }
RenderSystem.color4f((color >> 16 & 255) / 255F, (color >> 8 & 255) / 255F, (color & 255) / 255F, 0.5F); }
Helper.renderWeirdBox(box.minX, box.minY, box.minZ, box.maxX - box.minX, box.maxY - box.minY, box.maxZ - box.minZ);
}*/
@SubscribeEvent @SubscribeEvent
public void onOverlayRender(RenderGameOverlayEvent.Post event) { public void onOverlayRender(RenderGameOverlayEvent.Post event) {
@ -423,6 +419,13 @@ public class ClientEvents {
RenderSystem.setShaderColor(1F, 1F, 1F, 1); RenderSystem.setShaderColor(1F, 1F, 1F, 1);
stack.popPose(); stack.popPose();
} }
if (hoveringAuraSpot != null) {
var format = NumberFormat.getInstance();
var amount = IAuraChunk.getAuraChunk(mc.level, hoveringAuraSpot).getDrainSpot(hoveringAuraSpot);
var color = amount > 0 ? ChatFormatting.GREEN : ChatFormatting.RED;
mc.font.drawShadow(stack, color + format.format(amount), res.getGuiScaledWidth() / 2F + 5, res.getGuiScaledHeight() / 2F - 11, 0xFFFFFF);
}
} }
} }
} }