diff --git a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java index de323386b..6fa2a48c5 100644 --- a/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java +++ b/src/main/java/vazkii/botania/api/subtile/TileEntitySpecialFlower.java @@ -154,7 +154,6 @@ public class TileEntitySpecialFlower extends TileEntity implements ITickableTile protected void tickFlower() { ticksExisted++; - // todo 1.14 this isn't being markDirtied, but do we even want to keep this field around? } @Override diff --git a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java index 51755e326..468435b00 100644 --- a/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java @@ -29,7 +29,7 @@ public final class TooltipAdditionDisplayHandler { if (evt.getStack().isEmpty()) { return; } - MatrixStack ms = new MatrixStack(); // todo 1.16 get from event? + MatrixStack ms = evt.getMatrixStack(); ItemStack stack = evt.getStack(); int width = evt.getWidth(); diff --git a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/AccessoryRenderHelper.java similarity index 95% rename from src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java rename to src/main/java/vazkii/botania/client/core/helper/AccessoryRenderHelper.java index 4a33fa98e..f3f96ec0b 100644 --- a/src/main/java/vazkii/botania/api/item/AccessoryRenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/AccessoryRenderHelper.java @@ -6,16 +6,13 @@ * Botania is Open Source and distributed under the * Botania License: http://botaniamod.net/license.php */ -package vazkii.botania.api.item; +package vazkii.botania.client.core.helper; import com.mojang.blaze3d.matrix.MatrixStack; import net.minecraft.entity.LivingEntity; import net.minecraft.util.math.vector.Vector3f; -/** - * A few helper methods for the render. - */ public final class AccessoryRenderHelper { /** diff --git a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java index a7475f4a6..2233fe859 100644 --- a/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java +++ b/src/main/java/vazkii/botania/client/core/helper/RenderHelper.java @@ -124,7 +124,6 @@ public final class RenderHelper { .target(itemTarget) .alpha(new RenderState.AlphaState(0.05F)) .lightmap(enableLightmap).build(true); - // todo 1.15: need normals? SPARK = RenderType.makeType(LibResources.PREFIX_MOD + "spark", DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP, GL11.GL_QUADS, 256, glState); RenderType lightRelay = RenderType.makeType(LibResources.PREFIX_MOD + "light_relay", DefaultVertexFormats.POSITION_COLOR_TEX_LIGHTMAP, GL11.GL_QUADS, 64, glState); LIGHT_RELAY = useShaders ? new ShaderWrappedRenderLayer(ShaderHelper.BotaniaShader.HALO, null, lightRelay) : lightRelay; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java index fd41c65ea..27d8dedc2 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java @@ -41,7 +41,7 @@ import net.minecraftforge.event.entity.player.PlayerEvent; import org.lwjgl.opengl.GL11; -import vazkii.botania.api.item.AccessoryRenderHelper; +import vazkii.botania.client.core.helper.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.core.handler.MiscellaneousIcons; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java index 1fdae06e0..70fc8a7d0 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java @@ -26,7 +26,7 @@ import net.minecraftforge.api.distmarker.OnlyIn; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.living.LivingHurtEvent; -import vazkii.botania.api.item.AccessoryRenderHelper; +import vazkii.botania.client.core.helper.AccessoryRenderHelper; import vazkii.botania.client.fx.SparkleParticleData; import vazkii.botania.client.lib.LibResources; import vazkii.botania.client.model.ModelCloak; diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java index f8574675f..a4f5fd557 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemKnockbackBelt.java @@ -25,7 +25,7 @@ import net.minecraft.util.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.api.distmarker.OnlyIn; -import vazkii.botania.api.item.AccessoryRenderHelper; +import vazkii.botania.client.core.helper.AccessoryRenderHelper; import vazkii.botania.client.lib.LibResources; public class ItemKnockbackBelt extends ItemBauble { diff --git a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java index 022635156..8c20e6d57 100644 --- a/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java +++ b/src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java @@ -26,7 +26,7 @@ import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.player.PlayerEvent; -import vazkii.botania.api.item.AccessoryRenderHelper; +import vazkii.botania.client.core.helper.AccessoryRenderHelper; import vazkii.botania.api.mana.IManaUsingItem; import vazkii.botania.api.mana.ManaItemHandler; import vazkii.botania.client.lib.LibResources;