mirror of
https://github.com/GTNewHorizons/Mantle.git
synced 2026-11-18 11:19:20 +00:00
Fix lighting not disabled after item rendering, add a slot color
This commit is contained in:
1 parent
7c6f34d9f8
commit
fa7fe71e27
7 files changed
+8
-5
No files matched your search
@@ -10,6 +10,7 @@ public class AppearanceData implements IDataItem {
|
||||
public int arrowColor = 0xFFFFD3;
|
||||
public int arrowColorHover = 0xFF541C;
|
||||
public int hoverColor = 0x77EE541C;
|
||||
public int slotColor = 0xFF844C;
|
||||
public int lockedSectionColor = 0x000000;
|
||||
public float scale = 0.5F;
|
||||
public String title = "";
|
||||
|
||||
+1
-1
@@ -43,7 +43,7 @@ public class ContentBlockInteraction extends PageContent {
|
||||
addTitle(list, title);
|
||||
}
|
||||
|
||||
list.add(new ElementImage(x, y, IMG_SMITHING.width, IMG_SMITHING.height, IMG_SMITHING, book.appearance.coverColor));
|
||||
list.add(new ElementImage(x, y, IMG_SMITHING.width, IMG_SMITHING.height, IMG_SMITHING, book.appearance.slotColor));
|
||||
|
||||
if(input != null && !input.id.equals("")) {
|
||||
list.add(new ElementItem(x + INPUT_X, y + INPUT_Y, ITEM_SCALE, input.getItems(), input.action));
|
||||
|
||||
@@ -50,13 +50,13 @@ public class ContentCrafting extends PageContent {
|
||||
if(grid_size.equalsIgnoreCase("small")) {
|
||||
x = GuiBook.PAGE_WIDTH / 2 - IMG_CRAFTING_SMALL.width / 2;
|
||||
height = y + IMG_CRAFTING_SMALL.height;
|
||||
list.add(new ElementImage(x, y, IMG_CRAFTING_SMALL.width, IMG_CRAFTING_SMALL.height, IMG_CRAFTING_SMALL, book.appearance.coverColor));
|
||||
list.add(new ElementImage(x, y, IMG_CRAFTING_SMALL.width, IMG_CRAFTING_SMALL.height, IMG_CRAFTING_SMALL, book.appearance.slotColor));
|
||||
resultX = x + X_RESULT_SMALL;
|
||||
resultY = y + Y_RESULT_SMALL;
|
||||
} else if(grid_size.equalsIgnoreCase("large")) {
|
||||
x = GuiBook.PAGE_WIDTH / 2 - IMG_CRAFTING_LARGE.width / 2;
|
||||
height = y + IMG_CRAFTING_LARGE.height;
|
||||
list.add(new ElementImage(x, y, IMG_CRAFTING_LARGE.width, IMG_CRAFTING_LARGE.height, IMG_CRAFTING_LARGE, book.appearance.coverColor));
|
||||
list.add(new ElementImage(x, y, IMG_CRAFTING_LARGE.width, IMG_CRAFTING_LARGE.height, IMG_CRAFTING_LARGE, book.appearance.slotColor));
|
||||
resultX = x + X_RESULT_LARGE;
|
||||
resultY = y + Y_RESULT_LARGE;
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ public class ContentSmelting extends PageContent {
|
||||
TextData tdTitle = new TextData(title);
|
||||
tdTitle.underlined = true;
|
||||
list.add(new ElementText(0, 0, GuiBook.PAGE_WIDTH, 9, new TextData[]{tdTitle}));
|
||||
list.add(new ElementImage(x, y, IMG_SMELTING.width, IMG_SMELTING.height, IMG_SMELTING, book.appearance.coverColor));
|
||||
list.add(new ElementImage(x, y, IMG_SMELTING.width, IMG_SMELTING.height, IMG_SMELTING, book.appearance.slotColor));
|
||||
|
||||
if(input != null && !input.id.equals("")) {
|
||||
list.add(new ElementItem(x + INPUT_X, y + INPUT_Y, ITEM_SCALE, input.getItems(), input.action));
|
||||
|
||||
@@ -45,7 +45,7 @@ public class ContentSmithing extends PageContent {
|
||||
addTitle(list, title);
|
||||
}
|
||||
|
||||
list.add(new ElementImage(x, y, IMG_SMITHING.width, IMG_SMITHING.height, IMG_SMITHING, book.appearance.coverColor));
|
||||
list.add(new ElementImage(x, y, IMG_SMITHING.width, IMG_SMITHING.height, IMG_SMITHING, book.appearance.slotColor));
|
||||
|
||||
if(input != null && !input.id.equals("")) {
|
||||
list.add(new ElementItem(x + INPUT_X, y + INPUT_Y, ITEM_SCALE, input.getItems(), input.action));
|
||||
|
||||
@@ -85,6 +85,7 @@ public class GuiBook extends GuiScreen implements IProgressMeter {
|
||||
|
||||
this.statFile = statFile;
|
||||
this.mc = Minecraft.getMinecraft();
|
||||
this.fontRendererObj = mc.fontRendererObj;
|
||||
init();
|
||||
}
|
||||
|
||||
|
||||
@@ -84,6 +84,7 @@ public class ElementItem extends SizedBookElement {
|
||||
}
|
||||
|
||||
GlStateManager.popMatrix();
|
||||
RenderHelper.disableStandardItemLighting();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user