Fixed dialog image size issue. Dialog images can also use URLs now.

This commit is contained in:
Luis C.M committed 2022-11-09 21:33:04 -06:00
1 parent cc39e62bd4
commit 4b1fb37366
2 files changed
+100 -24

No files matched your search

@@ -1,6 +1,7 @@
package noppes.npcs.client.gui.player;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import net.minecraft.client.Minecraft;
@@ -66,6 +67,8 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
private int textSoundTime = 0;
private int textPauseTime = 0;
private HashMap<Integer,GuiDialogImage> dialogImages = new HashMap<>();
public GuiDialogInteract(EntityNPCInterface npc, Dialog dialog){
super(npc);
this.dialog = dialog;
@@ -171,11 +174,17 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
}
for (IDialogImage dialogImage : dialog.dialogImages.values()) {
GuiDialogImage image = new GuiDialogImage((DialogImage) dialogImage);
if (image.imageType != 0)
if (dialogImage.getImageType() != 0)
continue;
GuiDialogImage image;
if (dialogImages.containsKey(dialogImage.getId())) {
image = dialogImages.get(dialogImage.getId());
} else {
image = new GuiDialogImage((DialogImage) dialogImage);
dialogImages.put(dialogImage.getId(),image);
}
GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
GL11.glDisable(GL11.GL_ALPHA_TEST);
@@ -190,11 +199,17 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
GL11.glPushMatrix();
for (IDialogImage dialogImage : dialog.dialogImages.values()) {
GuiDialogImage image = new GuiDialogImage((DialogImage) dialogImage);
if (image.imageType != 1)
if (dialogImage.getImageType() != 1)
continue;
GuiDialogImage image;
if (dialogImages.containsKey(dialogImage.getId())) {
image = dialogImages.get(dialogImage.getId());
} else {
image = new GuiDialogImage((DialogImage) dialogImage);
dialogImages.put(dialogImage.getId(),image);
}
GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
GL11.glDisable(GL11.GL_ALPHA_TEST);
@@ -453,11 +468,17 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
GL11.glPushMatrix();
for (IDialogImage dialogImage : dialog.dialogImages.values()) {
GuiDialogImage image = new GuiDialogImage((DialogImage) dialogImage);
if (image.imageType != 2)
if (dialogImage.getImageType() != 2)
continue;
GuiDialogImage image;
if (dialogImages.containsKey(dialogImage.getId())) {
image = dialogImages.get(dialogImage.getId());
} else {
image = new GuiDialogImage((DialogImage) dialogImage);
dialogImages.put(dialogImage.getId(),image);
}
GL11.glEnable(GL11.GL_BLEND);
OpenGlHelper.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
GL11.glDisable(GL11.GL_ALPHA_TEST);
@@ -618,6 +639,7 @@ public class GuiDialogInteract extends GuiNPCInterface implements IGuiClose
public void appendDialog(Dialog dialog) {
closeOnEsc = !dialog.disableEsc;
this.dialogImages.clear();
this.dialog = dialog;
this.options = new ArrayList<Integer>();