This commit is contained in:
Vincent Lee committed 2020-01-10 17:06:28 -06:00
1 parent b4986a683a
commit 7cf4afe271
45 files changed
+316 -261

No files matched your search

@@ -11,15 +11,19 @@
package vazkii.botania.client.core.handler;
import com.google.common.collect.ImmutableMap;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.player.AbstractClientPlayerEntity;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.entity.IEntityRenderer;
import net.minecraft.client.renderer.entity.layers.LayerRenderer;
import net.minecraft.client.renderer.entity.model.PlayerModel;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.entity.player.PlayerModelPart;
@@ -65,7 +69,7 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
}
@Override
public void render(@Nonnull AbstractClientPlayerEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
public void render(MatrixStack ms, IRenderTypeBuffer buffers, int light, @Nonnull AbstractClientPlayerEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
if(player.isInvisible())
return;
@@ -81,16 +85,11 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
name = name.toLowerCase();
if(player.isWearing(PlayerModelPart.CAPE) && flowerMap.containsKey(name))
renderFlower(player, flowerMap.get(name), partialTicks);
renderFlower(ms, buffers, player, flowerMap.get(name));
GlStateManager.popMatrix();
}
@Override
public boolean shouldCombineTextures() {
return false;
}
public static void firstStart() {
if(!startedLoading) {
new ThreadContributorListLoader();
@@ -139,17 +138,17 @@ public final class ContributorFancinessHandler extends LayerRenderer<AbstractCli
}
@SuppressWarnings("deprecation")
private static void renderFlower(PlayerEntity player, ItemStack flower, float partialTicks) {
GlStateManager.pushMatrix();
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
GlStateManager.rotatef(180, 0, 0, 1);
GlStateManager.translated(0, -0.85, 0);
GlStateManager.rotatef(-90, 0, 1, 0);
GlStateManager.scaled(0.5, 0.5, 0.5);
private static void renderFlower(MatrixStack ms, IRenderTypeBuffer buffers, PlayerEntity player, ItemStack flower) {
ms.push();
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180));
ms.translate(0, -0.85, 0);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
ms.scale(0.5F, 0.5F, 0.5F);
// todo 1.15 shader
ShaderHelper.useShader(ShaderHelper.gold);
Minecraft.getInstance().getItemRenderer().renderItem(flower, player, ItemCameraTransforms.TransformType.NONE, false);
Minecraft.getInstance().getItemRenderer().renderItem(player, flower, ItemCameraTransforms.TransformType.NONE, false, ms, buffers, player.world, 0xF000F0, OverlayTexture.DEFAULT_UV);
ShaderHelper.releaseShader();
GlStateManager.popMatrix();
ms.pop();
}
private static class ThreadContributorListLoader extends Thread {
@@ -97,7 +97,7 @@ public final class ModelHandler {
RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower();
RenderTilePylon renderTilePylon = new RenderTilePylon();
ClientRegistry.bindTileEntityRenderer(TileAltar.TYPE, RenderTileAltar::new);
ClientRegistry.bindTileEntityRenderer(TileSpreader.TYPE, new RenderTileSpreader());
ClientRegistry.bindTileEntityRenderer(TileSpreader.TYPE, RenderTileSpreader::new);
ClientRegistry.bindTileEntityRenderer(TilePool.TYPE, new RenderTilePool());
ClientRegistry.bindTileEntityRenderer(TileRuneAltar.TYPE, new RenderTileRuneAltar());
ClientRegistry.bindTileEntityRenderer(TilePylon.TYPE, renderTilePylon);
@@ -17,11 +17,14 @@ import org.lwjgl.opengl.GL11;
public final class IconHelper {
// todo 1.15 remove this and just render real generated models added using addSpecialModel
/**
* Renders a sprite from the spritesheet with depth, like a "builtin/generated" item model.
* Adapted from ItemRenderer.renderItemIn2D, 1.7.10
*/
@Deprecated
public static void renderIconIn3D(Tessellator tess, float p_78439_1_, float p_78439_2_, float p_78439_3_, float p_78439_4_, int width, int height, float thickness) {
/*
BufferBuilder wr = tess.getBuffer();
wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL);
wr.pos(0.0D, 0.0D, 0.0D).tex(p_78439_1_, p_78439_4_).normal(0, 0, 1).endVertex();
@@ -95,6 +98,7 @@ public final class IconHelper {
}
tess.draw();
*/
}
@@ -11,6 +11,7 @@
package vazkii.botania.client.model;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.model.Model;
import net.minecraft.client.renderer.model.ModelRenderer;
import vazkii.botania.client.render.tile.RenderTileBrewery;
@@ -24,7 +25,8 @@ public class ModelBrewery extends Model {
final ModelRenderer plate;
public ModelBrewery() {
super(RenderType::getEntitySolid);
textureWidth = 32;
textureHeight = 16;
@@ -10,6 +10,9 @@
*/
package vazkii.botania.client.model;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.renderer.model.Model;
import net.minecraft.client.renderer.model.ModelRenderer;
@@ -29,8 +32,8 @@ public class ModelSpreader extends Model {
final ModelRenderer inside;
public ModelSpreader() {
textureWidth = 64;
super(RenderType::getEntitySolid);
textureWidth = 64;
textureHeight = 64;
top = new ModelRenderer(this, 0, 0);
@@ -67,24 +70,25 @@ public class ModelSpreader extends Model {
inside.addCuboid(-3.0F, -3.0F, -3.0F, 6, 6, 6, 0.0F);
}
public void render() {
float f = 1F / 16F;
@Override
public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) {
float f = 1F / 16F; // todo 1.15
top.render(f);
sideL.render(f);
sideR.render(f);
back.render(f);
bottom.render(f);
top.render(ms, buffer, light, overlay, r, g, b, a);
sideL.render(ms, buffer, light, overlay, r, g, b, a);
sideR.render(ms, buffer, light, overlay, r, g, b, a);
back.render(ms, buffer, light, overlay, r, g, b, a);
bottom.render(ms, buffer, light, overlay, r, g, b, a);
holeT.render(f);
holeL.render(f);
holeR.render(f);
holeB.render(f);
holeT.render(ms, buffer, light, overlay, r, g, b, a);
holeL.render(ms, buffer, light, overlay, r, g, b, a);
holeR.render(ms, buffer, light, overlay, r, g, b, a);
holeB.render(ms, buffer, light, overlay, r, g, b, a);
}
public void renderCube() {
float f = 1F / 16F;
public void renderCube(MatrixStack ms, IVertexBuilder buffer, int light, int overlay) {
float f = 1F / 16F; // todo 1.15
inside.render(f);
inside.render(ms, buffer, light, overlay);
}
}
@@ -10,6 +10,7 @@ public class ModelArmor extends BipedModel {
protected final EquipmentSlotType slot;
public ModelArmor(EquipmentSlotType slot) {
super(1);
this.slot = slot;
}
@@ -221,7 +221,7 @@ public class ModelArmorElementium extends ModelArmor {
}
@Override
public void render(@Nonnull LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) {
helmAnchor.showModel = slot == EquipmentSlotType.HEAD;
bodyAnchor.showModel = slot == EquipmentSlotType.CHEST;
@@ -246,6 +246,6 @@ public class ModelArmorElementium extends ModelArmor {
bipedLeftLeg = bootL;
}
super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
super.render(ms, buffer, light, overlay, r, g, b, a);
}
}
@@ -175,7 +175,7 @@ public class ModelArmorManasteel extends ModelArmor {
}
@Override
public void render(@Nonnull LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch) {
public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) {
helmAnchor.showModel = slot == EquipmentSlotType.HEAD;
bodyAnchor.showModel = slot == EquipmentSlotType.CHEST;
@@ -200,6 +200,6 @@ public class ModelArmorManasteel extends ModelArmor {
bipedLeftLeg = bootL;
}
super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch);
super.render(ms, buffer, light, overlay, r, g, b, a);
}
}
@@ -10,6 +10,8 @@
*/
package vazkii.botania.client.model.armor;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.renderer.model.ModelRenderer;
import net.minecraft.entity.LivingEntity;
import net.minecraft.inventory.EquipmentSlotType;
@@ -147,8 +149,8 @@ public class ModelArmorManaweave extends ModelArmor {
}
@Override
public void render(@Nonnull LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) {
helmAnchor.showModel = slot == EquipmentSlotType.HEAD;
bodyAnchor.showModel = slot == EquipmentSlotType.CHEST;
armRAnchor.showModel = slot == EquipmentSlotType.CHEST;
@@ -171,6 +173,6 @@ public class ModelArmorManaweave extends ModelArmor {
bipedLeftLeg = bootL;
}
super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
super.render(ms, buffer, light, overlay, r, g, b, a);
}
}
@@ -10,6 +10,8 @@
*/
package vazkii.botania.client.model.armor;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.renderer.model.ModelRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
@@ -269,8 +271,8 @@ public class ModelArmorTerrasteel extends ModelArmor {
}
@Override
public void render(@Nonnull LivingEntity entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
public void render(MatrixStack ms, IVertexBuilder buffer, int light, int overlay, float r, float g, float b, float a) {
helmAnchor.showModel = slot == EquipmentSlotType.HEAD;
bodyAnchor.showModel = slot == EquipmentSlotType.CHEST;
armLAnchor.showModel = slot == EquipmentSlotType.CHEST;
@@ -295,6 +297,6 @@ public class ModelArmorTerrasteel extends ModelArmor {
bipedLeftLeg = bootL;
}
super.render(entity, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
super.render(ms, buffer, light, overlay, r, g, b, a);
}
}
@@ -10,14 +10,18 @@
*/
package vazkii.botania.client.render.tile;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BlockModelRenderer;
import net.minecraft.client.renderer.BlockRendererDispatcher;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Direction;
import net.minecraftforge.client.model.data.IModelData;
@@ -30,8 +34,12 @@ import java.util.Random;
public class RenderTileFloatingFlower extends TileEntityRenderer {
public RenderTileFloatingFlower(TileEntityRendererDispatcher manager) {
super(manager);
}
@Override
public void render(@Nonnull TileEntity tile, double d0, double d1, double d2, float t, int digProgress) {
public void render(@Nonnull TileEntity tile, float t, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
if (ConfigHandler.CLIENT.staticFloaters.get())
return;
@@ -39,29 +47,25 @@ public class RenderTileFloatingFlower extends TileEntityRenderer {
if (!data.hasProperty(BotaniaStateProps.FLOATING_DATA))
return;
GlStateManager.pushMatrix();
GlStateManager.color4f(1F, 1F, 1F, 1F);
GlStateManager.translated(d0, d1, d2);
ms.push();
double worldTime = ClientTickHandler.ticksInGame + t;
if(tile.getWorld() != null)
worldTime += new Random(tile.getPos().hashCode()).nextInt(1000);
GlStateManager.translatef(0.5F, 0, 0.5F);
GlStateManager.rotatef(-((float) worldTime * 0.5F), 0F, 1F, 0F);
GlStateManager.translated(-0.5, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0.5);
ms.translate(0.5F, 0, 0.5F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-((float) worldTime * 0.5F)));
ms.translate(-0.5, (float) Math.sin(worldTime * 0.05F) * 0.1F, 0.5);
GlStateManager.rotatef(4F * (float) Math.sin(worldTime * 0.04F), 1F, 0F, 0F);
GlStateManager.rotatef(90.0F, 0.0F, 1.0F, 0.0F);
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(4F * (float) Math.sin(worldTime * 0.04F)));
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90.0F));
BlockRendererDispatcher brd = Minecraft.getInstance().getBlockRendererDispatcher();
BlockState state = tile.getWorld().getBlockState(tile.getPos());
IBakedModel model = brd.getModelForState(state);
renderModelBrightnessColor(brd.getBlockModelRenderer(), state, model, data);
GlStateManager.popMatrix();
ms.pop();
}
@@ -10,9 +10,11 @@
*/
package vazkii.botania.client.render.tile;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
@@ -126,11 +128,13 @@ public class RenderTilePylon extends TileEntityRenderer<TilePylon> {
}
public static class TEISR extends ItemStackTileEntityRenderer {
private static final TilePylon DUMMY = new TilePylon();
@Override
public void renderByItem(ItemStack stack) {
public void render(ItemStack stack, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
if(Block.getBlockFromItem(stack.getItem()) instanceof BlockPylon) {
RenderTilePylon.forceVariant = ((BlockPylon) Block.getBlockFromItem(stack.getItem())).variant;
TileEntityRenderer r = TileEntityRendererDispatcher.instance.getRenderer(TilePylon.class);
TileEntityRenderer r = TileEntityRendererDispatcher.instance.getRenderer(DUMMY);
((RenderTilePylon) r).renderPylon(null, 0, 0, 0, 0);
}
}
@@ -10,8 +10,11 @@
*/
package vazkii.botania.client.render.tile;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
@@ -28,10 +31,8 @@ public class RenderTileRuneAltar extends TileEntityRenderer<TileRuneAltar> {
private final ModelSpinningCubes cubes = new ModelSpinningCubes();
@Override
public void render(@Nonnull TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) {
GlStateManager.pushMatrix();
GlStateManager.color4f(1F, 1F, 1F, 1F);
GlStateManager.translated(x, y, z);
public void render(@Nonnull TileRuneAltar altar, float partticks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
ms.push();
int items = 0;
for(int i = 0; i < altar.getSizeInventory(); i++)
@@ -47,23 +48,21 @@ public class RenderTileRuneAltar extends TileEntityRenderer<TileRuneAltar> {
double time = ClientTickHandler.ticksInGame + partticks;
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
for(int i = 0; i < altar.getSizeInventory(); i++) {
GlStateManager.pushMatrix();
GlStateManager.translatef(0.5F, 1.25F, 0.5F);
GlStateManager.rotatef(angles[i] + (float) time, 0F, 1F, 0F);
GlStateManager.translatef(1.125F, 0F, 0.25F);
GlStateManager.rotatef(90F, 0F, 1F, 0F);
GlStateManager.translated(0D, 0.075 * Math.sin((time + i * 10) / 5D), 0F);
ms.push();
ms.translate(0.5F, 1.25F, 0.5F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(angles[i] + (float) time));
ms.translate(1.125F, 0F, 0.25F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F));
ms.translate(0D, 0.075 * Math.sin((time + i * 10) / 5D), 0F);
ItemStack stack = altar.getItemHandler().getStackInSlot(i);
Minecraft mc = Minecraft.getInstance();
if(!stack.isEmpty()) {
mc.getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
mc.getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND, light, overlay, ms, buffers);
}
GlStateManager.popMatrix();
ms.pop();
}
GlStateManager.disableAlphaTest();
GlStateManager.pushMatrix();
GlStateManager.translatef(0.5F, 1.8F, 0.5F);
GlStateManager.rotatef(180F, 1F, 0F, 1F);
@@ -10,12 +10,19 @@
*/
package vazkii.botania.client.render.tile;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.block.BlockState;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.RenderTypeLookup;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation;
import vazkii.botania.api.ColorHelper;
@@ -43,92 +50,92 @@ public class RenderTileSpreader extends TileEntityRenderer<TileSpreader> {
private static final ModelSpreader model = new ModelSpreader();
public RenderTileSpreader(TileEntityRendererDispatcher manager) {
super(manager);
}
@Override
public void render(@Nonnull TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) {
GlStateManager.pushMatrix();
GlStateManager.enableRescaleNormal();
GlStateManager.color4f(1F, 1F, 1F, 1F);
GlStateManager.translated(d0, d1, d2);
public void render(@Nonnull TileSpreader spreader, float ticks, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
ms.push();
GlStateManager.translatef(0.5F, 1.5F, 0.5F);
GlStateManager.rotatef(spreader.rotationX + 90F, 0F, 1F, 0F);
GlStateManager.translatef(0F, -1F, 0F);
GlStateManager.rotatef(spreader.rotationY, 1F, 0F, 0F);
GlStateManager.translatef(0F, 1F, 0F);
ms.translate(0.5F, 1.5F, 0.5F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(spreader.rotationX + 90F));
ms.translate(0F, -1F, 0F);
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(spreader.rotationY));
ms.translate(0F, 1F, 0F);
ResourceLocation r = spreader.isRedstone() ? textureRs : spreader.isDreamwood() ? textureDw : spreader.isULTRA_SPREADER() ? textureG : texture;
ResourceLocation texture = spreader.isRedstone() ? textureRs : spreader.isDreamwood() ? textureDw : spreader.isULTRA_SPREADER() ? textureG : RenderTileSpreader.texture;
if(ClientProxy.dootDoot)
r = spreader.isRedstone() ? textureRsHalloween : spreader.isDreamwood() ? textureDwHalloween : spreader.isULTRA_SPREADER() ? textureGHalloween : textureHalloween;
texture = spreader.isRedstone() ? textureRsHalloween : spreader.isDreamwood() ? textureDwHalloween : spreader.isULTRA_SPREADER() ? textureGHalloween : textureHalloween;
Minecraft.getInstance().textureManager.bindTexture(r);
GlStateManager.scalef(1F, -1F, -1F);
ms.scale(1F, -1F, -1F);
double time = ClientTickHandler.ticksInGame + ticks;
float r = 1, g = 1, b = 1;
if(spreader.isULTRA_SPREADER()) {
Color color = Color.getHSBColor((float) ((time * 5 + new Random(spreader.getPos().hashCode()).nextInt(10000)) % 360) / 360F, 0.4F, 0.9F);
GlStateManager.color3f(color.getRed() / 255F, color.getGreen() / 255F, color.getBlue() / 255F);
r = color.getRed() / 255F;
g = color.getGreen() / 255F;
b = color.getBlue() / 255F;
}
model.render();
GlStateManager.color3f(1F, 1F, 1F);
IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture));
model.render(ms, buffer, light, overlay, r, g, b, 1);
GlStateManager.pushMatrix();
ms.push();
double worldTicks = spreader.getWorld() == null ? 0 : time;
GlStateManager.rotatef((float) worldTicks % 360, 0F, 1F, 0F);
GlStateManager.translatef(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F);
model.renderCube();
GlStateManager.popMatrix();
GlStateManager.scalef(1F, -1F, -1F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion((float) worldTicks % 360));
ms.translate(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F);
model.renderCube(ms, buffer, light, overlay);
ms.pop();
ms.scale(1F, -1F, -1F);
ItemStack stack = spreader.getItemHandler().getStackInSlot(0);
if(!stack.isEmpty()) {
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
stack.getItem();
GlStateManager.pushMatrix();
GlStateManager.translatef(0.0F, -1F, -0.4675F);
GlStateManager.rotatef(180, 0, 0, 1);
GlStateManager.rotatef(180, 1, 0, 0);
GlStateManager.scalef(1.0F, 1.0F, 1.0F);
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
GlStateManager.popMatrix();
ms.push();
ms.translate(0.0F, -1F, -0.4675F);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180));
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180));
ms.scale(1.0F, 1.0F, 1.0F);
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, overlay, ms, buffers);
ms.pop();
}
if(spreader.paddingColor != null) {
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
BlockState carpet = ColorHelper.CARPET_MAP.get(spreader.paddingColor).getDefaultState();
IBakedModel model = Minecraft.getInstance().getBlockRendererDispatcher().getModelForState(carpet);
buffer = buffers.getBuffer(RenderTypeLookup.getBlockLayer(carpet));
GlStateManager.translatef(-0.5F, -0.5F, 0.5F);
ms.translate(-0.5F, -0.5F, 0.5F);
float f = 1 / 16F;
GlStateManager.translatef(0, -f - 0.001F, 0);
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
GlStateManager.translatef(0, f + 0.001F, 0);
GlStateManager.rotatef(-90, 0, 1, 0);
ms.translate(0, -f - 0.001F, 0);
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.translate(0, f + 0.001F, 0);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
GlStateManager.translatef(-0.001F, 0, 0);
GlStateManager.rotatef(270, 0, 0, 1);
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
GlStateManager.translatef(0, 0.001F, 0);
GlStateManager.rotatef(-90, 0, 1, 0);
ms.translate(-0.001F, 0, 0);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(270));
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.translate(0, 0.001F, 0);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
GlStateManager.translatef(0, 15 * f + 0.001F, -0.001F);
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
GlStateManager.translatef(0, -0.001F, 0.001F);
GlStateManager.rotatef(-90, 0, 1, 0);
ms.translate(0, 15 * f + 0.001F, -0.001F);
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.translate(0, -0.001F, 0.001F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
GlStateManager.translatef(15 * f + 0.001F, f, 0.001F);
GlStateManager.rotatef(270, 0, 0, 1);
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
GlStateManager.translatef(-0.001F, 0, -0.001F);
GlStateManager.rotatef(-90, 0, 1, 0);
ms.translate(15 * f + 0.001F, f, 0.001F);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(270));
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
ms.translate(-0.001F, 0, -0.001F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
GlStateManager.translatef(-0.001F, -1 + f + 0.001F, -f + 0.001F);
GlStateManager.rotatef(90, 1, 0, 0);
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(carpet, 1.0F);
ms.translate(-0.001F, -1 + f + 0.001F, -f + 0.001F);
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(90));
Minecraft.getInstance().getBlockRendererDispatcher().getBlockModelRenderer().render(ms.peek(), buffer, carpet, model, 1, 1, 1, light, overlay);
}
GlStateManager.enableRescaleNormal();
GlStateManager.popMatrix();
ms.pop();
}
}
@@ -1,26 +1,29 @@
package vazkii.botania.client.render.tile;
import com.google.common.base.Preconditions;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.tileentity.ItemStackTileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.IItemProvider;
public class TEISR extends ItemStackTileEntityRenderer {
private final IItemProvider item;
private final Class<? extends TileEntity> clazz;
private final TileEntity dummy;
public TEISR(IItemProvider item, Class<? extends TileEntity> clazz) {
public TEISR(IItemProvider item, TileEntityType<?> type) {
this.item = Preconditions.checkNotNull(item);
this.clazz = clazz;
this.dummy = type.create();
}
@Override
public void renderByItem(ItemStack stack) {
public void render(ItemStack stack, MatrixStack ms, IRenderTypeBuffer buffers, int light, int overlay) {
if(stack.getItem() == item.asItem()) {
TileEntityRendererDispatcher.instance.getRenderer(clazz)
.render(null, 0,0, 0, 0, -1);
TileEntityRendererDispatcher.instance.getRenderer(dummy)
.render(null, 0, ms, buffers, light, overlay);
}
}
}
@@ -24,6 +24,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.BlockRayTraceResult;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.common.IPlantable;
@@ -70,7 +71,7 @@ public class BlockAltGrass extends BlockMod {
}
@Override
public void tick(BlockState state, World world, BlockPos pos, Random rand) {
public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random rand) {
if(!world.isRemote && state.getBlock() == this && world.getLight(pos.up()) >= 9) {
for(int l = 0; l < 4; ++l) {
BlockPos pos1 = pos.add(rand.nextInt(3) - 1, rand.nextInt(5) - 3, rand.nextInt(3) - 1);
@@ -521,7 +521,7 @@ public final class ModBlocks {
register(r, new BlockPetalBlock(color, builder), color.getName() + LibBlockNames.PETAL_BLOCK_SUFFIX);
}
register(r, new BlockCorporeaIndex(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_INDEX);
register(r, new BlockCorporeaIndex(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL).nonOpaque()), LibBlockNames.CORPOREA_INDEX);
register(r, new BlockCorporeaFunnel(Block.Properties.create(Material.IRON).hardnessAndResistance(5.5F).sound(SoundType.METAL)), LibBlockNames.CORPOREA_FUNNEL);
builder = Block.Properties.create(Material.PLANTS).doesNotBlockMovement().hardnessAndResistance(0).sound(SoundType.PLANT).lightValue(3);
@@ -829,12 +829,12 @@ public final class ModBlocks {
register(r, new ItemBlockMod(naturaPylon, pylonProps), naturaPylon.getRegistryName());
register(r, new ItemBlockMod(gaiaPylon, pylonProps), gaiaPylon.getRegistryName());
register(r, new ItemBlockMod(teruTeruBozu, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.teruTeruBozu, TileTeruTeruBozu.class))), teruTeruBozu.getRegistryName());
register(r, new ItemBlockMod(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.avatar, TileAvatar.class))), avatar.getRegistryName());
register(r, new ItemBlockMod(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.bellows, TileBellows.class))), bellows.getRegistryName());
register(r, new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.brewery, TileBrewery.class))), brewery.getRegistryName());
register(r, new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaIndex, TileCorporeaIndex.class))), corporeaIndex.getRegistryName());
register(r, new ItemBlockMod(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.hourglass, TileHourglass.class))), hourglass.getRegistryName());
register(r, new ItemBlockMod(teruTeruBozu, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.teruTeruBozu, TileTeruTeruBozu.TYPE))), teruTeruBozu.getRegistryName());
register(r, new ItemBlockMod(avatar, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.avatar, TileAvatar.TYPE))), avatar.getRegistryName());
register(r, new ItemBlockMod(bellows, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.bellows, TileBellows.TYPE))), bellows.getRegistryName());
register(r, new ItemBlockMod(brewery, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.brewery, TileBrewery.TYPE))), brewery.getRegistryName());
register(r, new ItemBlockMod(corporeaIndex, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.corporeaIndex, TileCorporeaIndex.TYPE))), corporeaIndex.getRegistryName());
register(r, new ItemBlockMod(hourglass, ModItems.defaultBuilder().setTEISR(() -> () -> new TEISR(ModBlocks.hourglass, TileHourglass.TYPE))), hourglass.getRegistryName());
return null;
}
@@ -35,9 +35,4 @@ public class BlockCorporeaIndex extends BlockCorporeaBase {
public TileCorporeaBase createTileEntity(@Nonnull BlockState state, @Nonnull IBlockReader world) {
return new TileCorporeaIndex();
}
@Override
public boolean isSolid(BlockState state) {
return false;
}
}
@@ -18,6 +18,7 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockReader;
import net.minecraft.world.IWorldReader;
import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld;
import vazkii.botania.api.state.BotaniaStateProps;
import vazkii.botania.common.block.tile.corporea.TileCorporeaBase;
import vazkii.botania.common.block.tile.corporea.TileCorporeaInterceptor;
@@ -38,7 +39,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase {
}
@Override
public void tick(BlockState state, World world, BlockPos pos, Random rand) {
public void scheduledTick(BlockState state, ServerWorld world, BlockPos pos, Random rand) {
world.setBlockState(pos, state.with(BotaniaStateProps.POWERED, false));
}
@@ -208,12 +208,8 @@ public class TileHourglass extends TileSimpleInventory implements ITickableTileE
ItemStack stack = itemHandler.getStackInSlot(0);
if(!stack.isEmpty()) {
RenderHelper.enableGUIStandardItemLighting();
GlStateManager.enableRescaleNormal();
mc.getItemRenderer().renderItemIntoGUI(stack, x, y);
mc.getItemRenderer().renderItemOverlays(mc.fontRenderer, stack, x, y);
GlStateManager.disableRescaleNormal();
RenderHelper.disableStandardItemLighting();
int time = getTotalTime();
String timeStr = StringUtils.ticksToElapsedTime(time);
@@ -97,7 +97,7 @@ public class TileSpawnerClaw extends TileMod implements IManaReceiver, ITickable
double d0 = j >= 1 ? listnbt.getDouble(0) : (double)blockpos.getX() + (world.rand.nextDouble() - world.rand.nextDouble()) * (double)logic.spawnRange + 0.5D;
double d1 = j >= 2 ? listnbt.getDouble(1) : (double)(blockpos.getY() + world.rand.nextInt(3) - 1);
double d2 = j >= 3 ? listnbt.getDouble(2) : (double)blockpos.getZ() + (world.rand.nextDouble() - world.rand.nextDouble()) * (double)logic.spawnRange + 0.5D;
if (world.areCollisionShapesEmpty(optional.get().func_220328_a(d0, d1, d2))) {
if (world.doesNotCollide(optional.get().func_220328_a(d0, d1, d2))) {
Entity entity = EntityType.func_220335_a(compoundnbt, world, (p_221408_6_) -> {
p_221408_6_.setLocationAndAngles(d0, d1, d2, p_221408_6_.rotationYaw, p_221408_6_.rotationPitch);
return p_221408_6_;
@@ -69,7 +69,7 @@ public class EntityThrownItem extends ItemEntity {
@Override
public void tick() {
super.tick();
Vec3d vec3 = new Vec3d(posX, posY, posZ);
Vec3d vec3 = getPositionVec();
Vec3d vec31 = getPositionVec().add(getMotion());
RayTraceResult ray = world.rayTraceBlocks(new RayTraceContext(vec3, vec31,
@@ -119,7 +119,7 @@ public class EntityThrownItem extends ItemEntity {
if (!world.isRemote) {
Entity item = getItem().getItem().createEntity(world, this, getItem());
if (item == null) {
item = new ItemEntity(world, posX, posY, posZ, getItem());
item = new ItemEntity(world, getX(), getY(), getZ(), getItem());
world.addEntity(item);
}
item.setMotion(getMotion().scale(0.25));
@@ -135,7 +135,7 @@ public class EntityThrownItem extends ItemEntity {
if (!world.isRemote) {
Entity item = getItem().getItem().createEntity(world, this, getItem());
if (item == null) {
item = new ItemEntity(world, posX, posY, posZ, getItem());
item = new ItemEntity(world, getX(), getY(), getZ(), getItem());
world.addEntity(item);
}
item.setMotion(getMotion());
@@ -1,12 +1,12 @@
package vazkii.botania.common.integration.curios;
import com.google.common.collect.Multimap;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.Direction;
import net.minecraftforge.common.capabilities.Capability;
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.common.util.LazyOptional;
import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -24,8 +24,6 @@ import vazkii.botania.common.core.handler.EquipmentHandler;
import vazkii.botania.common.core.handler.ModSounds;
import vazkii.botania.common.item.equipment.bauble.ItemBauble;
import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.function.Predicate;
// Classloading-safe way to attach curio behaviour to our items
@@ -85,7 +83,7 @@ public class CurioIntegration extends EquipmentHandler {
}
@Override
public void onCurioTick(String identifier, LivingEntity entity) {
public void onCurioTick(String identifier, int index, LivingEntity entity) {
getItem().onWornTick(stack, entity);
}
@@ -130,8 +128,8 @@ public class CurioIntegration extends EquipmentHandler {
}
@Override
public void doRender(String identifier, LivingEntity entitylivingbaseIn, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
getItem().doRender(stack, entitylivingbaseIn, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch, scale);
public void render(String identifier, MatrixStack ms, IRenderTypeBuffer buffers, int light, LivingEntity livingEntity, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
getItem().doRender(stack, livingEntity, ms, buffers, light, limbSwing, limbSwingAmount, partialTicks, ageInTicks, netHeadYaw, headPitch);
}
}
}
@@ -525,10 +525,7 @@ public class ItemCraftingHalo extends ItemMod {
AbstractGui.fill(x - 6, y - 6, x + l + 6, y + 37, 0x22000000);
AbstractGui.fill(x - 4, y - 4, x + l + 4, y + 35, 0x22000000);
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
GlStateManager.enableRescaleNormal();
mc.getItemRenderer().renderItemAndEffectIntoGUI(craftingTable, mc.getWindow().getScaledWidth() / 2 - 8, mc.getWindow().getScaledHeight() / 2 - 52);
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
mc.fontRenderer.drawStringWithShadow(name, x, y, 0xFFFFFF);
} else {
@@ -561,8 +558,6 @@ public class ItemCraftingHalo extends ItemMod {
AbstractGui.fill(x + 66, y + 14, x + 92, y + 40, 0x22000000);
AbstractGui.fill(x - 2, y - 2, x + 56, y + 56, 0x22000000);
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
GlStateManager.enableRescaleNormal();
for(int i = 0; i < 9; i++) {
ItemStack stack = recipe[i];
if(!stack.isEmpty()) {
@@ -577,7 +572,6 @@ public class ItemCraftingHalo extends ItemMod {
mc.getItemRenderer().renderItemAndEffectIntoGUI(recipe[9], x + 72, y + 18);
mc.getItemRenderer().renderItemOverlays(mc.fontRenderer, recipe[9], x + 72, y + 18);
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
}
int yoff = 110;
@@ -12,7 +12,9 @@ package vazkii.botania.common.item.equipment.bauble;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.mojang.blaze3d.matrix.MatrixStack;
import net.minecraft.client.gui.screen.Screen;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.util.ITooltipFlag;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.ai.attributes.AttributeModifier;
@@ -159,5 +161,5 @@ public abstract class ItemBauble extends ItemMod implements ICosmeticAttachable,
}
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {}
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {}
}
@@ -10,9 +10,11 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.BufferBuilder;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.model.IBakedModel;
@@ -81,7 +83,7 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
Variant variant = ((ItemBaubleCosmetic) stack.getItem()).variant;
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
if(variant.isHead) {
@@ -10,9 +10,11 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GLX;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -113,7 +115,7 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
AccessoryRenderHelper.rotateIfSneaking(player);
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
@@ -10,10 +10,13 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.entity.player.ClientPlayerEntity;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.LivingEntity;
@@ -62,13 +65,12 @@ public class ItemCloudPendant extends ItemBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.rotateIfSneaking(player);
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
GlStateManager.rotatef(180F, 1F, 0F, 0F);
GlStateManager.translatef(-0.2F, -0.3F, armor ? 0.2F : 0.15F);
GlStateManager.scalef(0.5F, 0.5F, 0.5F);
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F));
ms.translate(-0.2F, -0.3F, armor ? 0.2F : 0.15F);
ms.scale(0.5F, 0.5F, 0.5F);
TextureAtlasSprite gemIcon = stack.getItem() == ModItems.superCloudPendant
? MiscellaneousIcons.INSTANCE.nimbusGem
@@ -11,10 +11,14 @@
package vazkii.botania.common.item.equipment.bauble;
import com.google.common.base.Predicates;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.MobEntity;
@@ -97,13 +101,12 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
GlStateManager.scaled(0.8, 0.8, 0.8);
GlStateManager.rotatef(-90, 0, 1, 0);
GlStateManager.rotatef(180, 1, 0, 0);
GlStateManager.translated(0.1625, -1.625, 0.40);
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND);
ms.scale(0.8F, 0.8F, 0.8F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90));
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180));
ms.translate(0.1625, -1.625, 0.40);
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.GROUND, light, OverlayTexture.DEFAULT_UV, ms, buffers);
}
}
@@ -10,10 +10,12 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GLX;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.AbstractGui;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -294,7 +296,7 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
int meta = getVariant(stack);
if(meta > 0 && meta <= MiscellaneousIcons.INSTANCE.tiaraWingIcons.length) {
TextureAtlasSprite icon = MiscellaneousIcons.INSTANCE.tiaraWingIcons[meta - 1];
@@ -10,9 +10,13 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
@@ -59,15 +63,13 @@ public class ItemGoddessCharm extends ItemBauble implements IManaUsingItem {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
GlStateManager.pushMatrix();
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToFace();
AccessoryRenderHelper.defaultTransforms();
GlStateManager.rotatef(-90F, 0F, 1F, 0F);
GlStateManager.translatef(0.5F, 0.2F, 0.45F);
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
GlStateManager.popMatrix();
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(-90F));
ms.translate(0.5F, 0.2F, 0.45F);
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.DEFAULT_UV, ms, buffers);
}
@Override
@@ -10,9 +10,11 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GLX;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.EquipmentSlotType;
@@ -74,7 +76,7 @@ public class ItemHolyCloak extends ItemBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
ItemHolyCloak item = ((ItemHolyCloak) stack.getItem());
AccessoryRenderHelper.rotateIfSneaking(player);
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
@@ -10,12 +10,15 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.block.BlockState;
import net.minecraft.block.Blocks;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.enchantment.FrostWalkerEnchantment;
@@ -68,13 +71,12 @@ public class ItemIcePendant extends ItemBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
GlStateManager.rotatef(180F, 1F, 0F, 0F);
GlStateManager.translatef(-0.36F, -0.3F, armor ? 0.2F : 0.15F);
GlStateManager.rotatef(-45F, 0F, 0F, 1F);
GlStateManager.scalef(0.5F, 0.5F, 0.5F);
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F));
ms.translate(-0.36F, -0.3F, armor ? 0.2F : 0.15F);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(-45F));
ms.scale(0.5F, 0.5F, 0.5F);
TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.snowflakePendantGem;
float f = gemIcon.getMinU();
@@ -10,10 +10,13 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import it.unimi.dsi.fastutil.ints.IntArrayList;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.Entity;
@@ -70,7 +73,7 @@ public class ItemItemFinder extends ItemBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity living, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
public void doRender(ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.itemFinderGem;
float f = gemIcon.getMinU();
float f1 = gemIcon.getMaxU();
@@ -78,11 +81,10 @@ public class ItemItemFinder extends ItemBauble {
float f3 = gemIcon.getMaxV();
boolean armor = !living.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty();
AccessoryRenderHelper.translateToHeadLevel(living, partialTicks);
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
GlStateManager.rotatef(90F, 0F, 1F, 0F);
GlStateManager.rotatef(180F, 1F, 0F, 0F);
GlStateManager.translatef(-0.4F, -1.4F, armor ? -0.3F : -0.25F);
GlStateManager.scalef(0.75F, 0.75F, 0.75F);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(90F));
ms.multiply(Vector3f.POSITIVE_X.getDegreesQuaternion(180F));
ms.translate(-0.4F, -1.4F, armor ? -0.3F : -0.25F);
ms.scale(0.75F, 0.75F, 0.75F);
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getWidth(), gemIcon.getHeight(), 1F / 16F);
}
@@ -12,9 +12,13 @@ package vazkii.botania.common.item.equipment.bauble;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.entity.model.BipedModel;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
@@ -42,17 +46,16 @@ public class ItemKnockbackBelt extends ItemBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity living, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
Minecraft.getInstance().textureManager.bindTexture(texture);
GlStateManager.translatef(0F, 0.2F, 0F);
public void doRender(ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
ms.translate(0F, 0.2F, 0F);
float s = 1.05F / 16F;
GlStateManager.scalef(s, s, s);
ms.scale(s, s, s);
if(model == null)
model = new BipedModel();
model = new BipedModel(1.0F);
model.bipedBody.render(1F);
IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture));
model.bipedBody.render(ms, buffer, light, OverlayTexture.DEFAULT_UV);
}
}
@@ -10,9 +10,12 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.LivingEntity;
@@ -38,13 +41,12 @@ public class ItemLavaPendant extends ItemBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.rotateIfSneaking(player);
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
GlStateManager.scalef(0.5F, 0.5F, 0.5F);
GlStateManager.rotatef(180, 0, 0, 1);
GlStateManager.translated(-0.5, -0.90, armor ? -0.4 : -0.25);
ms.scale(0.5F, 0.5F, 0.5F);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180));
ms.translate(-0.5, -0.90, armor ? -0.4 : -0.25);
TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.pyroclastGem;
float f = gemIcon.getMinU();
@@ -10,6 +10,7 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.block.Block;
import net.minecraft.block.BlockState;
@@ -18,8 +19,11 @@ import net.minecraft.block.ComparatorBlock;
import net.minecraft.block.RedstoneWireBlock;
import net.minecraft.block.RepeaterBlock;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.model.ItemCameraTransforms;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.inventory.EquipmentSlotType;
@@ -38,7 +42,6 @@ import vazkii.botania.api.item.IBurstViewerBauble;
import vazkii.botania.api.item.ICosmeticAttachable;
import vazkii.botania.api.item.ICosmeticBauble;
import vazkii.botania.common.core.handler.EquipmentHandler;
import vazkii.botania.common.item.ModItems;
public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosmeticBauble {
@@ -48,17 +51,16 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.HEAD).isEmpty();
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
AccessoryRenderHelper.translateToHeadLevel(player, partialTicks);
AccessoryRenderHelper.translateToFace();
AccessoryRenderHelper.defaultTransforms();
GlStateManager.rotatef(180F, 0F, 1F, 0F);
GlStateManager.scalef(0.5F, 0.5F, 0.5F);
GlStateManager.translatef(0.5F, -0.2F, armor ? 0.12F : 0F);
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE);
ms.multiply(Vector3f.POSITIVE_Y.getDegreesQuaternion(180F));
ms.scale(0.5F, 0.5F, 0.5F);
ms.translate(0.5F, -0.2F, armor ? 0.12F : 0F);
Minecraft.getInstance().getItemRenderer().renderItem(stack, ItemCameraTransforms.TransformType.NONE, light, OverlayTexture.DEFAULT_UV, ms, buffers);
}
@OnlyIn(Dist.CLIENT)
@@ -92,9 +94,7 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
int x = mc.getWindow().getScaledWidth() / 2 + 15;
int y = mc.getWindow().getScaledHeight() / 2 - 8;
net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
mc.getItemRenderer().renderItemAndEffectIntoGUI(dispStack, x, y);
net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
mc.fontRenderer.drawStringWithShadow(text, x + 20, y + 4, 0xFFFFFF);
}
@@ -10,9 +10,12 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.LivingEntity;
@@ -49,13 +52,12 @@ public class ItemSuperLavaPendant extends ItemBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.rotateIfSneaking(player);
boolean armor = !player.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
GlStateManager.scaled(0.5, 0.5, 0.5);
GlStateManager.rotatef(180, 0, 0, 1);
GlStateManager.translated(-0.5, -0.90, armor ? -0.4 : -0.25);
ms.scale(0.5F, 0.5F, 0.5F);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180));
ms.translate(-0.5, -0.90, armor ? -0.4 : -0.25);
TextureAtlasSprite gemIcon = MiscellaneousIcons.INSTANCE.crimsonGem;
float f = gemIcon.getMinU();
@@ -10,9 +10,12 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.renderer.Vector3f;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.entity.Entity;
@@ -61,31 +64,30 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity living, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
public void doRender(ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
boolean armor = !living.getItemStackFromSlot(EquipmentSlotType.CHEST).isEmpty();
GlStateManager.rotatef(180, 0, 0, 1);
GlStateManager.translated(-0.3, -0.6, armor ? -0.18 : -0.12);
GlStateManager.scaled(0.6, 0.6, 0.6);
ms.multiply(Vector3f.POSITIVE_Z.getDegreesQuaternion(180));
ms.translate(-0.3, -0.6, armor ? -0.18 : -0.12);
ms.scale(0.6F, 0.6F, 0.6F);
for(int i = 0; i < 3; i++) {
GlStateManager.pushMatrix();
ms.push();
float width = 1F / 16F;
switch (i) {
case 0: break;
case 1:
double scale1 = 0.75;
float scale1 = 0.75F;
width /= 2F;
GlStateManager.translated(0.15, 0.15, -0.05);
ms.translate(0.15, 0.15, -0.05);
double time = ClientTickHandler.total * 0.12;
double dist = 0.05;
GlStateManager.translated(Math.sin(time) * dist, Math.cos(time * 0.5) * dist, 0);
ms.translate(Math.sin(time) * dist, Math.cos(time * 0.5) * dist, 0);
GlStateManager.scaled(scale1, scale1, scale1);
ms.scale(scale1, scale1, scale1);
break;
case 2:
GlStateManager.translated(0, 0, -0.05);
ms.translate(0, 0, -0.05);
break;
}
@@ -95,7 +97,7 @@ public class ItemThirdEye extends ItemBauble implements IManaUsingItem {
float f2 = gemIcon.getMinV();
float f3 = gemIcon.getMaxV();
IconHelper.renderIconIn3D(Tessellator.getInstance(), f1, f2, f, f3, gemIcon.getWidth(), gemIcon.getHeight(), width);
GlStateManager.popMatrix();
ms.pop();
}
}
@@ -11,9 +11,12 @@
package vazkii.botania.common.item.equipment.bauble;
import com.google.common.base.Predicates;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.entity.Entity;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.projectile.ThrowableEntity;
@@ -49,11 +52,10 @@ public class ItemTinyPlanet extends ItemBauble {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity living, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
Minecraft.getInstance().textureManager.bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
GlStateManager.scalef(0.5F, 0.5F, 0.5F);
GlStateManager.translatef(0, -1.5F, 0.5F);
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockBrightness(ModBlocks.tinyPlanet.getDefaultState(), 1.0F);
public void doRender(ItemStack stack, LivingEntity living, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
ms.scale(0.5F, 0.5F, 0.5F);
ms.translate(0, -1.5F, 0.5F);
Minecraft.getInstance().getBlockRendererDispatcher().renderBlockAsEntity(ModBlocks.tinyPlanet.getDefaultState(), ms, buffers, light, OverlayTexture.DEFAULT_UV);
}
public static void applyEffect(World world, double x, double y, double z) {
@@ -10,9 +10,13 @@
*/
package vazkii.botania.common.item.equipment.bauble;
import com.mojang.blaze3d.matrix.MatrixStack;
import com.mojang.blaze3d.platform.GlStateManager;
import com.mojang.blaze3d.vertex.IVertexBuilder;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.IRenderTypeBuffer;
import net.minecraft.client.renderer.entity.model.BipedModel;
import net.minecraft.client.renderer.texture.OverlayTexture;
import net.minecraft.entity.LivingEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.item.ItemStack;
@@ -141,18 +145,19 @@ public class ItemTravelBelt extends ItemBauble implements IManaUsingItem {
@Override
@OnlyIn(Dist.CLIENT)
public void doRender(ItemStack stack, LivingEntity player, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
Minecraft.getInstance().textureManager.bindTexture(((ItemTravelBelt) stack.getItem()).getRenderTexture());
public void doRender(ItemStack stack, LivingEntity player, MatrixStack ms, IRenderTypeBuffer buffers, int light, float limbSwing, float limbSwingAmount, float partialTicks, float ageInTicks, float netHeadYaw, float headPitch) {
AccessoryRenderHelper.rotateIfSneaking(player);
GlStateManager.translatef(0F, 0.2F, 0F);
ms.translate(0F, 0.2F, 0F);
float s = 1.05F / 16F;
GlStateManager.scalef(s, s, s);
ms.scale(s, s, s);
if(model == null)
model = new BipedModel();
model = new BipedModel(1F);
model.bipedBody.render(1F);
ResourceLocation texture = ((ItemTravelBelt) stack.getItem()).getRenderTexture();
IVertexBuilder buffer = buffers.getBuffer(model.getLayer(texture));
model.bipedBody.render(ms, buffer, light, OverlayTexture.DEFAULT_UV, 1, 1, 1, 1);
}
@Override
@@ -16,6 +16,7 @@ import net.minecraft.world.gen.ChunkGeneratorType;
import net.minecraft.world.gen.GenerationStage;
import net.minecraft.world.gen.feature.Feature;
import net.minecraft.world.gen.placement.IPlacementConfig;
import net.minecraft.world.gen.placement.NoPlacementConfig;
import net.minecraft.world.gen.placement.Placement;
import net.minecraftforge.common.BiomeDictionary;
import net.minecraftforge.event.RegistryEvent;
@@ -59,9 +60,9 @@ public class ModFeatures {
public static void addWorldgen() {
for(Biome biome : ForgeRegistries.BIOMES) {
if (BiomeDictionary.getTypes(biome).stream().noneMatch(TYPE_BLACKLIST::contains)) {
biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(MYSTICAL_FLOWERS, new MysticalFlowerConfig(), Placement.NOPE, IPlacementConfig.NO_PLACEMENT_CONFIG));
biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, MYSTICAL_FLOWERS.configure(new MysticalFlowerConfig()).createDecoratedFeature(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG)));
}
biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, Biome.createDecoratedFeature(MYSTICAL_MUSHROOMS, new MysticalFlowerConfig(), Placement.NOPE, IPlacementConfig.NO_PLACEMENT_CONFIG));
biome.addFeature(GenerationStage.Decoration.VEGETAL_DECORATION, MYSTICAL_MUSHROOMS.configure(new MysticalFlowerConfig()).createDecoratedFeature(Placement.NOPE.configure(IPlacementConfig.NO_PLACEMENT_CONFIG)));
}
}
}
@@ -156,7 +156,7 @@ public final class SkyblockWorldEvents {
if(player instanceof ServerPlayerEntity) {
ServerPlayerEntity pmp = (ServerPlayerEntity) player;
pmp.setPositionAndUpdate(pos.getX() + 0.5, pos.getY() + 1.6, pos.getZ() + 0.5);
pmp.setSpawnPoint(pos, true, player.world.getDimension().getType());
pmp.setSpawnPoint(pos, true, false, player.world.getDimension().getType());
if (ConfigHandler.COMMON.gogSpawnWithLexicon.get()) {
player.inventory.addItemStackToInventory(new ItemStack(ModItems.lexicon));
}
@@ -55,7 +55,7 @@ public class WorldTypeSkyblock extends WorldType {
public ChunkGenerator<?> createChunkGenerator(@Nonnull World world) {
if (world.dimension.getType() == DimensionType.OVERWORLD) {
OverworldGenSettings genSettings = SkyblockChunkGenerator.TYPE.createSettings();
OverworldBiomeProviderSettings biomeSettings = BiomeProviderType.VANILLA_LAYERED.createSettings().setWorldInfo(world.getWorldInfo()).setGeneratorSettings(genSettings);
OverworldBiomeProviderSettings biomeSettings = BiomeProviderType.VANILLA_LAYERED.getConfig(world.getWorldInfo()).setGeneratorSettings(genSettings);
return SkyblockChunkGenerator.TYPE.create(world, BiomeProviderType.VANILLA_LAYERED.create(biomeSettings), genSettings);
}
return super.createChunkGenerator(world);
@@ -5,6 +5,7 @@ import com.google.gson.GsonBuilder;
import net.minecraft.advancements.criterion.EnchantmentPredicate;
import net.minecraft.advancements.criterion.ItemPredicate;
import net.minecraft.advancements.criterion.MinMaxBounds;
import net.minecraft.advancements.criterion.StatePropertiesPredicate;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.block.DoublePlantBlock;
@@ -189,14 +190,14 @@ public class BlockLootProvider implements IDataProvider {
private static LootTable.Builder genSlab(Block b) {
LootEntry.Builder<?> entry = ItemLootEntry.builder(b)
.acceptFunction(SetCount.builder(ConstantRange.of(2))
.acceptCondition(BlockStateProperty.builder(b).with(SlabBlock.TYPE, SlabType.DOUBLE)))
.acceptCondition(BlockStateProperty.builder(b).func_227567_a_(StatePropertiesPredicate.Builder.create().exactMatch(SlabBlock.TYPE, SlabType.DOUBLE))))
.acceptFunction(ExplosionDecay.builder());
return LootTable.builder().addLootPool(LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry));
}
private static LootTable.Builder genDoubleFlower(Block b) {
LootEntry.Builder<?> entry = ItemLootEntry.builder(b)
.acceptCondition(BlockStateProperty.builder(b).with(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER));
.acceptCondition(BlockStateProperty.builder(b).func_227567_a_(StatePropertiesPredicate.Builder.create().exactMatch(DoublePlantBlock.HALF, DoubleBlockHalf.LOWER)));
LootPool.Builder pool = LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry)
.acceptCondition(SurvivesExplosion.builder());
return LootTable.builder().addLootPool(pool);