Move radius rendering into a TESR for the special flowers

This commit is contained in:
Vincent Lee committed 2020-07-15 11:41:33 -05:00
1 parent 3b33dedc3d
commit 17f1fd5977
9 files changed
+114 -51

No files matched your search

@@ -53,31 +53,6 @@ public final class BlockHighlightRenderHandler {
ms.push();
if (Botania.proxy.isClientPlayerWearingMonocle() && pos != null && pos.getType() == RayTraceResult.Type.BLOCK) {
BlockPos bPos = ((BlockRayTraceResult) pos).getPos();
ItemStack stackHeld = PlayerHelper.getFirstHeldItem(mc.player, ModItems.twigWand);
if (!stackHeld.isEmpty() && ItemTwigWand.getBindMode(stackHeld)) {
Optional<BlockPos> coords = ItemTwigWand.getBindingAttempt(stackHeld);
if (coords.isPresent()) {
bPos = coords.get();
}
}
TileEntity tile = mc.world.getTileEntity(bPos);
if (tile instanceof TileEntitySpecialFlower) {
TileEntitySpecialFlower subtile = (TileEntitySpecialFlower) tile;
RadiusDescriptor descriptor = subtile.getRadius();
if (descriptor != null) {
if (descriptor.isCircle()) {
renderCircle(ms, buffers, descriptor.getSubtileCoords(), descriptor.getCircleRadius());
} else {
renderRectangle(ms, buffers, descriptor.getAABB(), true, null, (byte) 32);
}
}
}
}
double offY = -1.0 / 16 + 0.005;
for (Entity e : mc.world.getAllEntities()) {
if (e instanceof EntityMagicLandmine) {
@@ -106,13 +81,9 @@ public final class BlockHighlightRenderHandler {
buffers.finish();
}
private static void renderRectangle(MatrixStack ms, IRenderTypeBuffer buffers, AxisAlignedBB aabb, boolean inner, @Nullable Integer color, byte alpha) {
double renderPosX = Minecraft.getInstance().getRenderManager().info.getProjectedView().getX();
double renderPosY = Minecraft.getInstance().getRenderManager().info.getProjectedView().getY();
double renderPosZ = Minecraft.getInstance().getRenderManager().info.getProjectedView().getZ();
public static void renderRectangle(MatrixStack ms, IRenderTypeBuffer buffers, AxisAlignedBB aabb, boolean inner, @Nullable Integer color, byte alpha) {
ms.push();
ms.translate(aabb.minX - renderPosX, aabb.minY - renderPosY, aabb.minZ - renderPosZ);
ms.translate(aabb.minX, aabb.minY, aabb.minZ);
if (color == null) {
color = MathHelper.hsvToRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F);
@@ -146,16 +117,12 @@ public final class BlockHighlightRenderHandler {
ms.pop();
}
private static void renderCircle(MatrixStack ms, IRenderTypeBuffer buffers, BlockPos center, double radius) {
double renderPosX = Minecraft.getInstance().getRenderManager().info.getProjectedView().getX();
double renderPosY = Minecraft.getInstance().getRenderManager().info.getProjectedView().getY();
double renderPosZ = Minecraft.getInstance().getRenderManager().info.getProjectedView().getZ();
public static void renderCircle(MatrixStack ms, IRenderTypeBuffer buffers, BlockPos center, double radius) {
ms.push();
double x = center.getX() + 0.5;
double y = center.getY();
double z = center.getZ() + 0.5;
ms.translate(x - renderPosX, y - renderPosY, z - renderPosZ);
ms.translate(x, y, z);
int color = MathHelper.hsvToRGB(ClientTickHandler.ticksInGame % 200 / 200F, 0.6F, 1F);
int r = (color >> 16 & 0xFF);
int g = (color >> 8 & 0xFF);
@@ -60,11 +60,10 @@ public final class ModelHandler {
ClientRegistry.bindTileEntityRenderer(ModTiles.ENCHANTER, RenderTileEnchanter::new);
ClientRegistry.bindTileEntityRenderer(ModTiles.ALF_PORTAL, RenderTileAlfPortal::new);
ClientRegistry.bindTileEntityRenderer(ModTiles.MINI_ISLAND, RenderTileFloatingFlower::new);
// TODO 1.14 this seems highly questionable.
ModSubtiles.getTypes().stream()
.map(Pair::getSecond)
.map(rl -> Registry.BLOCK_ENTITY_TYPE.getValue(rl).get())
.forEach(typ -> ClientRegistry.bindTileEntityRenderer(typ, RenderTileFloatingFlower::new));
.forEach(typ -> ClientRegistry.bindTileEntityRenderer(typ, RenderTileSpecialFlower::new));
ClientRegistry.bindTileEntityRenderer(ModTiles.TINY_POTATO, RenderTileTinyPotato::new);
ClientRegistry.bindTileEntityRenderer(ModTiles.STARFIELD, RenderTileStarfield::new);
ClientRegistry.bindTileEntityRenderer(ModTiles.BREWERY, RenderTileBrewery::new);
@@ -11,8 +11,8 @@ package vazkii.botania.client.fx;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.systems.RenderSystem;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import com.mojang.datafixers.util.Pair;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.particle.IParticleRenderType;
@@ -29,11 +29,12 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.RayTraceContext;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.util.math.vector.Matrix4f;
import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.util.math.vector.Vector3f;
import org.lwjgl.opengl.GL11;
import vazkii.botania.client.core.handler.LightningHandler;
import vazkii.botania.client.lib.LibResources;
import vazkii.botania.common.core.helper.Vector3;
@@ -166,7 +167,7 @@ public class FXLightning extends Particle {
private static Vector3 getRelativeViewVector(Vector3 pos) {
Entity renderEntity = Minecraft.getInstance().getRenderViewEntity();
return new Vector3((float) renderEntity.getPosX() - pos.x, (float) renderEntity.getPosY() - pos.y, (float) renderEntity.getPosZ() - pos.z);
return new Vector3((float) renderEntity.getPosX() - pos.x, (float) renderEntity.getPosY() - pos.y, (float) renderEntity.getPosZ() - pos.z);
}
private static final IParticleRenderType LAYER = new IParticleRenderType() {
@@ -1,6 +1,15 @@
/*
* This class is distributed as part of the Botania Mod.
* Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*/
package vazkii.botania.client.fx;
import com.mojang.datafixers.util.Pair;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
@@ -9,6 +18,7 @@ import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.RayTraceContext;
import net.minecraft.util.math.RayTraceResult;
import net.minecraft.world.World;
import vazkii.botania.common.core.helper.Vector3;
import java.util.*;
@@ -62,7 +72,7 @@ public class LightningSegmentGenerator {
for (int i = 1; i < BRANCH_FACTOR; i++) {
Vector3 basepoint = startpoint.add(subsegment.multiply(i));
Vector3 randoff = segment.diff.perpendicular().normalize().rotate(rand.nextFloat() * 360, segment.diff)
.multiply((rand.nextFloat() - 0.5F) * amount * 2);
.multiply((rand.nextFloat() - 0.5F) * amount * 2);
newpoints[i] = new FXLightningBoltPoint(basepoint, randoff);
}
@@ -38,6 +38,10 @@ public class RenderTileFloatingFlower extends TileEntityRenderer<TileEntity> {
@Override
public void render(@Nonnull TileEntity tile, float t, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
renderFloatingIsland(tile, t, ms, buffers, light, overlay);
}
public static void renderFloatingIsland(TileEntity tile, float t, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
if (ConfigHandler.CLIENT.staticFloaters.get()) {
return;
}
@@ -68,7 +72,6 @@ public class RenderTileFloatingFlower extends TileEntityRenderer<TileEntity> {
brd.getBlockModelRenderer().renderModel(ms.getLast(), buffers.getBuffer(RenderTypeLookup.func_239220_a_(state, false)), state, ibakedmodel, 1, 1, 1, light, overlay, data);
ms.pop();
}
}
@@ -0,0 +1,81 @@
/*
* This class is distributed as part of the Botania Mod.
* Get the Source Code in github:
* https://github.com/Vazkii/Botania
*
* Botania is Open Source and distributed under the
* Botania License: http://botaniamod.net/license.php
*/
package vazkii.botania.client.render.tile;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.entity.LivingEntity;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.util.math.RayTraceResult;
import vazkii.botania.api.subtile.RadiusDescriptor;
import vazkii.botania.api.subtile.TileEntitySpecialFlower;
import vazkii.botania.client.core.handler.BlockHighlightRenderHandler;
import vazkii.botania.common.core.helper.PlayerHelper;
import vazkii.botania.common.item.ItemTwigWand;
import vazkii.botania.common.item.ModItems;
import vazkii.botania.common.item.equipment.bauble.ItemMonocle;
import java.util.Optional;
public class RenderTileSpecialFlower extends TileEntityRenderer<TileEntity> {
public RenderTileSpecialFlower(TileEntityRendererDispatcher dispatcher) {
super(dispatcher);
}
@Override
public void render(TileEntity tile, float partialTicks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
if (!(tile instanceof TileEntitySpecialFlower)
|| !(Minecraft.getInstance().renderViewEntity instanceof LivingEntity)) {
return;
}
LivingEntity view = (LivingEntity) Minecraft.getInstance().renderViewEntity;
if (!ItemMonocle.hasMonocle(view)) {
return;
}
RayTraceResult ray = Minecraft.getInstance().objectMouseOver;
if (ray != null && ray.getType() == RayTraceResult.Type.BLOCK) {
BlockPos pos = ((BlockRayTraceResult) ray).getPos();
if (tile.getPos().equals(pos) || hasBindingAttempt(view, tile.getPos())) {
RadiusDescriptor descriptor = ((TileEntitySpecialFlower) tile).getRadius();
if (descriptor != null) {
ms.push();
ms.translate(-tile.getPos().getX(), -tile.getPos().getY(), -tile.getPos().getZ());
if (descriptor.isCircle()) {
BlockHighlightRenderHandler.renderCircle(ms, buffers, descriptor.getSubtileCoords(), descriptor.getCircleRadius());
} else {
BlockHighlightRenderHandler.renderRectangle(ms, buffers, descriptor.getAABB(), true, null, (byte) 32);
}
ms.pop();
}
}
}
RenderTileFloatingFlower.renderFloatingIsland(tile, partialTicks, ms, buffers, light, overlay);
}
private static boolean hasBindingAttempt(LivingEntity view, BlockPos tilePos) {
ItemStack stackHeld = PlayerHelper.getFirstHeldItem(view, ModItems.twigWand);
if (!stackHeld.isEmpty() && ItemTwigWand.getBindMode(stackHeld)) {
Optional<BlockPos> coords = ItemTwigWand.getBindingAttempt(stackHeld);
return coords.isPresent() && coords.get().equals(tilePos);
}
return false;
}
}
@@ -13,6 +13,7 @@ import com.mojang.datafixers.util.Pair;
import net.minecraft.advancements.Advancement;
import net.minecraft.advancements.AdvancementManager;
import net.minecraft.advancements.PlayerAdvancements;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.ServerPlayerEntity;
import net.minecraft.item.BlockItemUseContext;
@@ -51,13 +52,13 @@ public final class PlayerHelper {
|| !player.getHeldItemOffhand().isEmpty() && template.isAssignableFrom(player.getHeldItemOffhand().getItem().getClass());
}
public static ItemStack getFirstHeldItem(PlayerEntity player, Item item) {
return getFirstHeldItem(player, s -> s.getItem() == item);
public static ItemStack getFirstHeldItem(LivingEntity living, Item item) {
return getFirstHeldItem(living, s -> s.getItem() == item);
}
public static ItemStack getFirstHeldItem(PlayerEntity player, Predicate<ItemStack> pred) {
ItemStack main = player.getHeldItemMainhand();
ItemStack offhand = player.getHeldItemOffhand();
public static ItemStack getFirstHeldItem(LivingEntity living, Predicate<ItemStack> pred) {
ItemStack main = living.getHeldItemMainhand();
ItemStack offhand = living.getHeldItemOffhand();
if (!main.isEmpty() && pred.test(main)) {
return main;
} else if (!offhand.isEmpty() && pred.test(offhand)) {
@@ -9,6 +9,7 @@
package vazkii.botania.common.core.helper;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.entity.Entity;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.math.AxisAlignedBB;
@@ -92,7 +92,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
mc.fontRenderer.drawStringWithShadow(ms, text, x + 20, y + 4, 0xFFFFFF);
}
public static boolean hasMonocle(PlayerEntity player) {
public static boolean hasMonocle(LivingEntity living) {
return !EquipmentHandler.findOrEmpty(stack -> {
if (!stack.isEmpty()) {
Item item = stack.getItem();
@@ -106,7 +106,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
}
}
return false;
}, player).isEmpty();
}, living).isEmpty();
}
}