Fix shedding page NPE, fix entity render making the world fullbright

This commit is contained in:
Hubry committed 2019-12-08 18:03:37 +01:00
1 parent 6666cf1e23
commit 6ab3ec39f6
2 files changed
+11 -11

No files matched your search

@@ -32,14 +32,14 @@ public class PageEntity extends LexiconPage{
int relativeMouseX, relativeMouseY;
boolean tooltipEntity;
final int size;
Constructor entityConstructor;
private Constructor<? extends Entity> entityConstructor;
public PageEntity(String unlocalizedName, String entity, int size) {
super(unlocalizedName);
Class EntityClass = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(entity)).getEntityClass();
Class<? extends Entity> entityClass = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(entity)).getEntityClass();
this.size = size;
try {
entityConstructor = EntityClass.getConstructor(World.class);
entityConstructor = entityClass.getConstructor(World.class);
} catch (Exception e) {
e.printStackTrace();
}
@@ -79,7 +79,7 @@ public class PageEntity extends LexiconPage{
@SideOnly(Side.CLIENT)
public void renderEntity(IGuiLexiconEntry gui, Entity entity, int x, int y, int scale, float rotation) {
dummyEntity.world = Minecraft.getMinecraft() != null ? Minecraft.getMinecraft().world : null;
dummyEntity.world = Minecraft.getMinecraft().world;
GlStateManager.enableColorMaterial();
GlStateManager.pushMatrix();
@@ -93,9 +93,9 @@ public class PageEntity extends LexiconPage{
GlStateManager.popMatrix();
RenderHelper.disableStandardItemLighting();
GlStateManager.disableRescaleNormal();
OpenGlHelper.setActiveTexture(OpenGlHelper.lightmapTexUnit);
GlStateManager.setActiveTexture(OpenGlHelper.lightmapTexUnit);
GlStateManager.disableTexture2D();
OpenGlHelper.setActiveTexture(OpenGlHelper.defaultTexUnit);
GlStateManager.setActiveTexture(OpenGlHelper.defaultTexUnit);
if(relativeMouseX >= x - dummyEntity.width * scale / 2 - 10 && relativeMouseY >= y - dummyEntity.height * scale - 20 && relativeMouseX <= x + dummyEntity.width * scale / 2 + 10 && relativeMouseY <= y + 20)
tooltipEntity = true;
@@ -41,11 +41,11 @@ public class PageShedding extends PageEntity {
private static final ResourceLocation sheddingOverlay = new ResourceLocation(LibResources.GUI_SHEDDING_OVERLAY);
final ItemStack shedStack;
ItemStack tooltipStack;
boolean tooltipEntry;
private final ItemStack shedStack;
private ItemStack tooltipStack = ItemStack.EMPTY;
private boolean tooltipEntry;
static boolean mouseDownLastTick = false;
private static boolean mouseDownLastTick = false;
public PageShedding(String unlocalizedName, String entity, int size, ItemStack shedStack) {
super(unlocalizedName, entity, size);
@@ -103,7 +103,7 @@ public class PageShedding extends PageEntity {
vazkii.botania.client.core.helper.RenderHelper.renderTooltip(mx, my, parsedTooltip);
}
tooltipStack = null;
tooltipStack = ItemStack.EMPTY;
tooltipEntry = tooltipEntity = false;
GlStateManager.disableBlend();
mouseDownLastTick = Mouse.isButtonDown(0);