cha0s/FunctionalStorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added extended name tooltips when sneaking, closes #19

Browse Source
This commit is contained in:
Buuz135 2022-03-21 20:56:57 +01:00
parent d312fecc2a
commit d6ed8a5c67
3 changed files with 41 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -96,7 +96,7 @@ dependencies {
compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.3.143:api") compileOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.3.143:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.3.143") runtimeOnly fg.deobf("mezz.jei:jei-1.18.2:9.5.3.143")
//runtimeOnly fg.deobf("curse.maven:refined-storage-243076:3569563") //runtimeOnly fg.deobf("curse.maven:refined-storage-243076:3569563")
implementation fg.deobf("curse.maven:the-one-probe-245211:3586969") implementation fg.deobf("curse.maven:the-one-probe-245211:3671753")
//runtimeOnly fg.deobf("curse.maven:create-328085:3600402") //runtimeOnly fg.deobf("curse.maven:create-328085:3600402")
//runtimeOnly fg.deobf("curse.maven:flywheel-486392:3600401") //runtimeOnly fg.deobf("curse.maven:flywheel-486392:3600401")
annotationProcessor "org.spongepowered:mixin:0.8.5:processor" annotationProcessor "org.spongepowered:mixin:0.8.5:processor"

15
src/main/java/com/buuz135/functionalstorage/compat/top/CustomElementItemStack.java
View File

@ -22,11 +22,18 @@ public class CustomElementItemStack implements IElement {
private final ItemStack itemStack; private final ItemStack itemStack;
private final IItemStyle style; private final IItemStyle style;
private final String display; private final String display;
private boolean displayName;
public CustomElementItemStack(ItemStack itemStack, String display, IItemStyle style) { public CustomElementItemStack(ItemStack itemStack, String display, IItemStyle style) {
this.itemStack = itemStack; this.itemStack = itemStack;
this.style = style; this.style = style;
this.display = display; this.display = display;
this.displayName = false;
}
public CustomElementItemStack(ItemStack itemStack, String display, IItemStyle style, boolean displayName) {
this(itemStack, display, style);
this.displayName = true;
} }
public CustomElementItemStack(FriendlyByteBuf buf) { public CustomElementItemStack(FriendlyByteBuf buf) {
@ -38,6 +45,7 @@ public class CustomElementItemStack implements IElement {
this.style = (new ItemStyle()).width(buf.readInt()).height(buf.readInt()); this.style = (new ItemStyle()).width(buf.readInt()).height(buf.readInt());
this.display = buf.readUtf(); this.display = buf.readUtf();
this.displayName = buf.readBoolean();
} }
public void render(PoseStack matrixStack, int x, int y) { public void render(PoseStack matrixStack, int x, int y) {
@ -50,12 +58,16 @@ public class CustomElementItemStack implements IElement {
ChatFormatting var10004 = ChatFormatting.RED; ChatFormatting var10004 = ChatFormatting.RED;
RenderHelper.renderText(var10000, matrixStack, x, y, var10004 + "ERROR: " + itemStack.getHoverName()); RenderHelper.renderText(var10000, matrixStack, x, y, var10004 + "ERROR: " + itemStack.getHoverName());
} }
if (this.displayName){
RenderHelper.renderText(Minecraft.getInstance(), matrixStack, x + 22, y + 7, itemStack.getHoverName());
}
} }
} }
public int getWidth() { public int getWidth() {
return this.style.getWidth(); return this.style.getWidth() + (this.displayName ? Minecraft.getInstance().font.width(itemStack.getHoverName().getString()) : 0) ;
} }
public int getHeight() { public int getHeight() {
@ -73,6 +85,7 @@ public class CustomElementItemStack implements IElement {
buf.writeInt(this.style.getWidth()); buf.writeInt(this.style.getWidth());
buf.writeInt(this.style.getHeight()); buf.writeInt(this.style.getHeight());
buf.writeUtf(this.display); buf.writeUtf(this.display);
buf.writeBoolean(this.displayName);
} }
public ResourceLocation getID() { public ResourceLocation getID() {

25
src/main/java/com/buuz135/functionalstorage/compat/top/FunctionalDrawerProvider.java
View File

@ -56,9 +56,21 @@ public class FunctionalDrawerProvider implements IProbeInfoProvider {
iProbeInfo.getElements().removeIf(iElement -> iElement instanceof ElementVertical); iProbeInfo.getElements().removeIf(iElement -> iElement instanceof ElementVertical);
ElementVertical vertical = new ElementVertical(); ElementVertical vertical = new ElementVertical();
if (blockEntity instanceof DrawerTile) { if (blockEntity instanceof DrawerTile) {
BigInventoryHandler handler = ((DrawerTile) blockEntity).getHandler();
if (handler.getSlots() == 1 || player.isShiftKeyDown() || probeMode == ProbeMode.EXTENDED){
ElementVertical elementVertical = new ElementVertical(iProbeInfo.defaultLayoutStyle().spacing(2).leftPadding(7).rightPadding(7));
elementVertical.getStyle().borderColor(Color.CYAN.darker().getRGB());
for (int i = 0; i < handler.getStoredStacks().size(); i++) {
BigInventoryHandler.BigStack storedStack = handler.getStoredStacks().get(i);
if (storedStack.getAmount() > 0 || (handler.isLocked() && !storedStack.getStack().isEmpty())) {
elementVertical.element(new CustomElementItemStack(storedStack.getStack(), NumberUtils.getFormatedBigNumber(storedStack.getAmount()) + "/" + NumberUtils.getFormatedBigNumber(handler.getSlotLimit(i)), iProbeInfo.defaultItemStyle(), true));
}
}
if (elementVertical.getElements().size() > 0) vertical.element(elementVertical);
vertical.element(new ElementVertical(iProbeInfo.defaultLayoutStyle().topPadding(4)));
} else {
ElementHorizontal abstractElementPanel = new ElementHorizontal(iProbeInfo.defaultLayoutStyle().spacing(8).leftPadding(7).rightPadding(7)); ElementHorizontal abstractElementPanel = new ElementHorizontal(iProbeInfo.defaultLayoutStyle().spacing(8).leftPadding(7).rightPadding(7));
abstractElementPanel.getStyle().borderColor(Color.CYAN.darker().getRGB()); abstractElementPanel.getStyle().borderColor(Color.CYAN.darker().getRGB());
BigInventoryHandler handler = ((DrawerTile) blockEntity).getHandler();
for (int i = 0; i < handler.getStoredStacks().size(); i++) { for (int i = 0; i < handler.getStoredStacks().size(); i++) {
BigInventoryHandler.BigStack storedStack = handler.getStoredStacks().get(i); BigInventoryHandler.BigStack storedStack = handler.getStoredStacks().get(i);
if (storedStack.getAmount() > 0 || (handler.isLocked() && !storedStack.getStack().isEmpty())) { if (storedStack.getAmount() > 0 || (handler.isLocked() && !storedStack.getStack().isEmpty())) {
@ -68,6 +80,7 @@ public class FunctionalDrawerProvider implements IProbeInfoProvider {
if (abstractElementPanel.getElements().size() > 0) vertical.element(abstractElementPanel); if (abstractElementPanel.getElements().size() > 0) vertical.element(abstractElementPanel);
vertical.element(new ElementVertical(iProbeInfo.defaultLayoutStyle().topPadding(4))); vertical.element(new ElementVertical(iProbeInfo.defaultLayoutStyle().topPadding(4)));
} }
}
if (blockEntity instanceof EnderDrawerTile) { if (blockEntity instanceof EnderDrawerTile) {
ElementHorizontal abstractElementPanel = new ElementHorizontal(iProbeInfo.defaultLayoutStyle().spacing(8).leftPadding(7).rightPadding(7)); ElementHorizontal abstractElementPanel = new ElementHorizontal(iProbeInfo.defaultLayoutStyle().spacing(8).leftPadding(7).rightPadding(7));
abstractElementPanel.getStyle().borderColor(Color.CYAN.darker().getRGB()); abstractElementPanel.getStyle().borderColor(Color.CYAN.darker().getRGB());
@ -75,7 +88,7 @@ public class FunctionalDrawerProvider implements IProbeInfoProvider {
for (int i = 0; i < savedData.getStoredStacks().size(); i++) { for (int i = 0; i < savedData.getStoredStacks().size(); i++) {
BigInventoryHandler.BigStack storedStack = savedData.getStoredStacks().get(i); BigInventoryHandler.BigStack storedStack = savedData.getStoredStacks().get(i);
if (storedStack.getAmount() > 0 || (savedData.isLocked() && !storedStack.getStack().isEmpty())) { if (storedStack.getAmount() > 0 || (savedData.isLocked() && !storedStack.getStack().isEmpty())) {
abstractElementPanel.element(new CustomElementItemStack(storedStack.getStack(), NumberUtils.getFormatedBigNumber(storedStack.getAmount()) + "/" + NumberUtils.getFormatedBigNumber(savedData.getSlotLimit(i)), iProbeInfo.defaultItemStyle())); abstractElementPanel.element(new CustomElementItemStack(storedStack.getStack(), NumberUtils.getFormatedBigNumber(storedStack.getAmount()) + "/" + NumberUtils.getFormatedBigNumber(savedData.getSlotLimit(i)), iProbeInfo.defaultItemStyle(), player.isShiftKeyDown() || probeMode == ProbeMode.EXTENDED));
} }
} }
if (abstractElementPanel.getElements().size() > 0) vertical.element(abstractElementPanel); if (abstractElementPanel.getElements().size() > 0) vertical.element(abstractElementPanel);
@ -94,11 +107,11 @@ public class FunctionalDrawerProvider implements IProbeInfoProvider {
if (blockEntity instanceof CompactingDrawerTile) { if (blockEntity instanceof CompactingDrawerTile) {
CompactingInventoryHandler inventoryHandler = ((CompactingDrawerTile) blockEntity).getHandler(); CompactingInventoryHandler inventoryHandler = ((CompactingDrawerTile) blockEntity).getHandler();
if (player.isShiftKeyDown() || probeMode == ProbeMode.EXTENDED) { if (player.isShiftKeyDown() || probeMode == ProbeMode.EXTENDED) {
ElementHorizontal abstractElementPanel = new ElementHorizontal(iProbeInfo.defaultLayoutStyle().spacing(12).leftPadding(7).rightPadding(7)); ElementVertical abstractElementPanel = new ElementVertical(iProbeInfo.defaultLayoutStyle().spacing(2).leftPadding(7).rightPadding(7));
abstractElementPanel.getStyle().borderColor(Color.CYAN.darker().getRGB()); abstractElementPanel.getStyle().borderColor(Color.CYAN.darker().getRGB());
abstractElementPanel.element(new CustomElementItemStack(inventoryHandler.getResultList().get(2).getResult(), NumberUtils.getFormatedBigNumber(inventoryHandler.getStackInSlot(2).getCount()) + "/" + NumberUtils.getFormatedBigNumber(inventoryHandler.getSlotLimit(2)), iProbeInfo.defaultItemStyle())); abstractElementPanel.element(new CustomElementItemStack(inventoryHandler.getResultList().get(2).getResult(), NumberUtils.getFormatedBigNumber(inventoryHandler.getStackInSlot(2).getCount()) + "/" + NumberUtils.getFormatedBigNumber(inventoryHandler.getSlotLimit(2)), iProbeInfo.defaultItemStyle(), true));
abstractElementPanel.element(new CustomElementItemStack(inventoryHandler.getResultList().get(1).getResult(), NumberUtils.getFormatedBigNumber(inventoryHandler.getStackInSlot(1).getCount()) + "/" + NumberUtils.getFormatedBigNumber(inventoryHandler.getSlotLimit(1)), iProbeInfo.defaultItemStyle())); abstractElementPanel.element(new CustomElementItemStack(inventoryHandler.getResultList().get(1).getResult(), NumberUtils.getFormatedBigNumber(inventoryHandler.getStackInSlot(1).getCount()) + "/" + NumberUtils.getFormatedBigNumber(inventoryHandler.getSlotLimit(1)), iProbeInfo.defaultItemStyle(), true));
abstractElementPanel.element(new CustomElementItemStack(inventoryHandler.getResultList().get(0).getResult(), NumberUtils.getFormatedBigNumber(inventoryHandler.getStackInSlot(0).getCount()) + "/" + NumberUtils.getFormatedBigNumber(inventoryHandler.getSlotLimit(0)), iProbeInfo.defaultItemStyle())); abstractElementPanel.element(new CustomElementItemStack(inventoryHandler.getResultList().get(0).getResult(), NumberUtils.getFormatedBigNumber(inventoryHandler.getStackInSlot(0).getCount()) + "/" + NumberUtils.getFormatedBigNumber(inventoryHandler.getSlotLimit(0)), iProbeInfo.defaultItemStyle(), true));
if (abstractElementPanel.getElements().size() > 0) vertical.element(abstractElementPanel); if (abstractElementPanel.getElements().size() > 0) vertical.element(abstractElementPanel);
} else { } else {
ElementHorizontal abstractElementPanel = new ElementHorizontal(iProbeInfo.defaultLayoutStyle().spacing(8).leftPadding(7).rightPadding(7)); ElementHorizontal abstractElementPanel = new ElementHorizontal(iProbeInfo.defaultLayoutStyle().spacing(8).leftPadding(7).rightPadding(7));