upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-13 03:07:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Inventory Offset Issue

Browse Source
This commit is contained in:
Kam committed 2024-03-15 01:34:57 -04:00
1 parent 9d73db3076
commit 06960a124a
5 files changed
+54 -24
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/gui/player/inventory/GuiCNPCInventory.java
+1 -5
View File
@@ -18,7 +18,6 @@ public class GuiCNPCInventory extends GuiNPCInterface {
public static int activeTab = 0;
protected Minecraft mc = Minecraft.getMinecraft();
protected boolean firstPass = true;
public GuiCNPCInventory() {
super();
@@ -31,10 +30,7 @@ public class GuiCNPCInventory extends GuiNPCInterface {
super.initGui();
guiTop +=10;
if(firstPass){
TabRegistry.updateTabValues(guiLeft, guiTop, InventoryTabCustomNpc.class);
firstPass = false;
}
TabRegistry.updateTabValues(guiLeft, guiTop, InventoryTabCustomNpc.class);
TabRegistry.addTabsToList(buttonList);
src/main/java/noppes/npcs/client/gui/player/inventory/GuiFaction.java
+4
View File
@@ -15,6 +15,7 @@ import noppes.npcs.constants.EnumPlayerPacket;
import noppes.npcs.controllers.data.Faction;
import noppes.npcs.controllers.data.PlayerFactionData;
import org.lwjgl.opengl.GL11;
import tconstruct.client.tabs.AbstractTab;
import java.util.ArrayList;
@@ -129,6 +130,9 @@ public class GuiFaction extends GuiCNPCInventory implements IGuiData {
@Override
protected void actionPerformed(GuiButton guibutton){
if(guibutton instanceof AbstractTab)
return;
if (guibutton.id >= 100 && guibutton.id <= 105) {
super.actionPerformed(guibutton);
return;
src/main/java/noppes/npcs/client/gui/player/inventory/GuiParty.java
+4
View File
@@ -18,6 +18,7 @@ import noppes.npcs.constants.EnumPacketServer;
import noppes.npcs.controllers.data.Party;
import noppes.npcs.controllers.data.Quest;
import org.lwjgl.opengl.GL11;
import tconstruct.client.tabs.AbstractTab;
import java.util.*;
@@ -210,6 +211,9 @@ public class GuiParty extends GuiCNPCInventory implements ITextfieldListener,ICu
@Override
protected void actionPerformed(GuiButton guibutton){
if(guibutton instanceof AbstractTab)
return;
Party party = ClientCacheHandler.party;
if (guibutton.id >= 100 && guibutton.id <= 105) {
super.actionPerformed(guibutton);
src/main/java/noppes/npcs/client/gui/player/inventory/GuiQuestLog.java
+41 -19
View File
@@ -18,6 +18,9 @@ import noppes.npcs.constants.EnumPlayerPacket;
import noppes.npcs.controllers.data.Party;
import noppes.npcs.util.ValueUtil;
import org.lwjgl.opengl.GL11;
import tconstruct.client.tabs.AbstractTab;
import tconstruct.client.tabs.InventoryTabCustomNpc;
import tconstruct.client.tabs.TabRegistry;
import java.util.*;
@@ -28,11 +31,11 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen
private EntityPlayer player;
private GuiCustomScroll scroll;
private HashMap<Integer,GuiMenuSideButton> sideButtons = new HashMap<Integer,GuiMenuSideButton>();
private HashMap<Integer,GuiNpcButton> otherButtons = new HashMap<Integer,GuiNpcButton>();
private QuestLogData data = new QuestLogData();
private boolean noQuests = false;
private byte questPages = 1;
private static long lastClicked = System.currentTimeMillis();
private boolean isPartySet = false;
private HashMap<String,String> questAlertsOnOpen;
private String trackedQuestKeyOnOpen;
@@ -50,6 +53,7 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen
}
public void initGui(){
super.initGui();
sideButtons.clear();
noQuests = false;
@@ -98,6 +102,8 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen
}
String partyQuestName = ClientCacheHandler.party != null ? ClientCacheHandler.party.getCurrentQuestName() : null;
isPartySet = Objects.equals(partyQuestName, data.selectedQuest);
if (showParty) {
// Objectives Forward--
addButton(new GuiButtonNextPage(11, guiLeft + 286, guiTop + 176, true));
@@ -105,13 +111,12 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen
// Party Back--
addButton(new GuiButtonNextPage(10, guiLeft + 144, guiTop + 176, false));
String questName = ClientCacheHandler.party != null ? ClientCacheHandler.party.getCurrentQuestName() : null;
GuiNpcButton partyButton = new GuiNpcButton(3, guiLeft + 150, guiTop + 151, 50, 20, new String[]{"party.party", "party.partying"}, Objects.equals(questName, data.selectedQuest) ? 1 : 0);
GuiNpcButton partyButton = new GuiNpcButton(3, guiLeft + 150, guiTop + 151, 50, 20, new String[]{"party.party", "party.partying"}, isPartySet ? 1 : 0);
addButton(partyButton);
partyButton.enabled = ClientCacheHandler.party != null && data.hasSelectedQuest()
&& ClientCacheHandler.party.getPartyLeaderName().equals(this.player.getCommandSenderName());
if (partyButton.enabled && Objects.equals(questName, data.selectedQuest)) {
if (partyButton.enabled && isPartySet) {
partyButton.packedFGColour = 0x32CD32;
}
@@ -128,16 +133,20 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen
GuiNpcButton alertButton = new GuiNpcButton(5, guiLeft + 205, guiTop + 151, 50, 20, new String[]{"quest.alerts", "quest.noAlerts"}, data.getQuestAlerts() ? 0 : 1);
addButton(alertButton);
getButton(1).visible = questPages == 1 && data.hasSelectedQuest();
getButton(2).visible = questPages == 2 && data.hasSelectedQuest();
getButton(4).visible = !data.selectedQuest.isEmpty() && getButton(1).visible;
getButton(5).visible = getButton(4).visible;
if (getButton(3) != null) {
getButton(3).visible = getButton(4).visible;
if(getButton(1) != null)
getButton(1).visible = questPages == 1 && data.hasSelectedQuest();
if(getButton(2) != null)
getButton(2).visible = questPages == 2 && data.hasSelectedQuest();
if (getButton(3) != null)
getButton(3).visible = !data.selectedQuest.isEmpty() && getButton(1).visible;
if(getButton(4) != null){
getButton(4).visible = !data.selectedQuest.isEmpty() && getButton(1).visible;
getButton(4).enabled = showTrackAlerts;
}
if(getButton(5) != null){
getButton(5).visible = getButton(4).visible;
getButton(5).enabled = showTrackAlerts;
}
getButton(4).enabled = showTrackAlerts;
getButton(5).enabled = showTrackAlerts;
}
@Override
@@ -157,14 +166,32 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen
@Override
protected void actionPerformed(GuiButton guibutton){
if(guibutton instanceof AbstractTab)
return;
if (guibutton.id >= 100 && guibutton.id <= 105) {
super.actionPerformed(guibutton);
return;
}
if(lastClicked > System.currentTimeMillis() - 10){
if(lastClicked > System.currentTimeMillis() - 5){
return;
}
if(guibutton.id == 11){
questPages = 1;
lastClicked = System.currentTimeMillis();
}
else if(guibutton.id == 10){
questPages = 0;
}
else if(guibutton.id == 1){
questPages = 2;
}
else if(guibutton.id == 2){
questPages = 1;
lastClicked = System.currentTimeMillis();
}
if (guibutton.id == 3)
{
if (Objects.equals(ClientCacheHandler.party.getCurrentQuestName(), data.selectedQuest)) {
@@ -348,11 +375,6 @@ public class GuiQuestLog extends GuiCNPCInventory implements ICustomScrollListen
}
}
@Override
public boolean doesGuiPauseGame()
{
return false;
}
@Override
public void setGuiData(NBTTagCompound compound) {
QuestLogData data = new QuestLogData();
src/main/java/noppes/npcs/client/gui/player/inventory/GuiSettings.java
+4
View File
@@ -6,6 +6,7 @@ import net.minecraft.util.ResourceLocation;
import noppes.npcs.client.gui.util.*;
import noppes.npcs.config.ConfigClient;
import org.lwjgl.opengl.GL11;
import tconstruct.client.tabs.AbstractTab;
public class GuiSettings extends GuiCNPCInventory implements ITextfieldListener {
@@ -72,6 +73,9 @@ public class GuiSettings extends GuiCNPCInventory implements ITextfieldListener
@Override
protected void actionPerformed(GuiButton btn){
if(btn instanceof AbstractTab)
return;
if (btn.id >= 100 && btn.id <= 105) {
super.actionPerformed(btn);
return;