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

Merge branch 'dev' of https://github.com/KAMKEEL/CustomNPC-Plus into dev

Browse Source
This commit is contained in:
Kam committed 2024-05-22 13:41:14 -04:00
2 parents 74aac7fee5 f495017b47
commit b4ae4fb22e
2 files changed
+223 -9
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/noppes/npcs/client/gui/util/GuiNPCInterface.java
+37 -9
View File
@@ -29,19 +29,22 @@ public abstract class GuiNPCInterface extends GuiScreen
public boolean drawDefaultBackground = true;
public EntityNPCInterface npc;
protected HashMap<Integer,GuiNpcButton> buttons = new HashMap<Integer,GuiNpcButton>();
private HashMap<Integer,GuiMenuTopButton> topbuttons = new HashMap<Integer,GuiMenuTopButton>();
private HashMap<Integer,GuiMenuSideButton> sidebuttons = new HashMap<Integer,GuiMenuSideButton>();
private HashMap<Integer,GuiNpcTextField> textfields = new HashMap<Integer,GuiNpcTextField>();
private HashMap<Integer,GuiNpcLabel> labels = new HashMap<Integer,GuiNpcLabel>();
private HashMap<Integer,GuiCustomScroll> scrolls = new HashMap<Integer,GuiCustomScroll>();
private HashMap<Integer,GuiNpcSlider> sliders = new HashMap<Integer,GuiNpcSlider>();
private HashMap<Integer,GuiScreen> extra = new HashMap<Integer,GuiScreen>();
protected HashMap<Integer,GuiMenuTopButton> topbuttons = new HashMap<Integer,GuiMenuTopButton>();
protected HashMap<Integer,GuiMenuSideButton> sidebuttons = new HashMap<Integer,GuiMenuSideButton>();
protected HashMap<Integer,GuiNpcTextField> textfields = new HashMap<Integer,GuiNpcTextField>();
protected HashMap<Integer,GuiNpcLabel> labels = new HashMap<Integer,GuiNpcLabel>();
protected HashMap<Integer,GuiCustomScroll> scrolls = new HashMap<Integer,GuiCustomScroll>();
protected HashMap<Integer,GuiNpcSlider> sliders = new HashMap<Integer,GuiNpcSlider>();
protected HashMap<Integer,GuiScreen> extra = new HashMap<Integer,GuiScreen>();
protected HashMap<Integer, GuiScrollableComponent> scrollableGuiInserts = new HashMap<>();
public String title;
private ResourceLocation background = null;
public boolean closeOnEsc = false;
public int guiLeft,guiTop,xSize,ySize;
private SubGuiInterface subgui;
public int mouseX, mouseY;
public int mouseX, mouseY, mouseScroll;
public static boolean recordScroll = true;
public float bgScale = 1;
public float bgScaleX = 1;
@@ -84,6 +87,7 @@ public abstract class GuiNPCInterface extends GuiScreen
topbuttons.clear();
scrolls.clear();
sliders.clear();
scrollableGuiInserts.clear();
Keyboard.enableRepeatEvents(true);
}
@Override
@@ -105,6 +109,12 @@ public abstract class GuiNPCInterface extends GuiScreen
extra.put(gui.id, gui);
}
public void addScrollableGui(int id, GuiScrollableComponent gui){
gui.setWorldAndResolution(mc, width, height);
gui.initGui();
scrollableGuiInserts.put(id, gui);
}
public void mouseClicked(int i, int j, int k)
{
if(subgui != null)
@@ -113,6 +123,12 @@ public abstract class GuiNPCInterface extends GuiScreen
for(GuiNpcTextField tf : new ArrayList<GuiNpcTextField>(textfields.values()))
if(tf.enabled)
tf.mouseClicked(i, j, k);
for(GuiScrollableComponent guiScrollableComponent : scrollableGuiInserts.values()) {
if(guiScrollableComponent.isMouseOver(i, j))
guiScrollableComponent.mouseClicked(i, j, k);
}
if (k == 0){
for(GuiCustomScroll scroll : new ArrayList<GuiCustomScroll>(scrolls.values())){
scroll.mouseClicked(i, j, k);
@@ -189,6 +205,11 @@ public abstract class GuiNPCInterface extends GuiScreen
return labels.get(i);
}
public GuiScrollableComponent getScrollableGui(int i) {
return scrollableGuiInserts.get(i);
}
public void addSlider(GuiNpcSlider slider){
sliders.put(slider.id,slider);
buttonList.add(slider);
@@ -217,6 +238,10 @@ public abstract class GuiNPCInterface extends GuiScreen
drawBackground();
}
if(recordScroll) {
mouseScroll = Mouse.getDWheel();
}
boolean subGui = hasSubGui();
drawCenteredString(fontRendererObj, title, width / 2, guiTop + 4, 0xffffff);
for(GuiNpcLabel label : labels.values())
@@ -226,7 +251,7 @@ public abstract class GuiNPCInterface extends GuiScreen
}
for(GuiCustomScroll scroll : scrolls.values()){
scroll.updateSubGUI(subGui);
scroll.drawScreen(i, j, f, !subGui && scroll.isMouseOver(i, j)?Mouse.getDWheel():0);
scroll.drawScreen(i, j, f, !subGui && scroll.isMouseOver(i, j)?mouseScroll:0);
}
for(GuiScreen gui : extra.values())
gui.drawScreen(i, j, f);
@@ -241,6 +266,9 @@ public abstract class GuiNPCInterface extends GuiScreen
button.drawHover(i, j, subGui);
}
}
for(GuiScrollableComponent guiScrollableComponent : scrollableGuiInserts.values()){
guiScrollableComponent.drawScreen(i, j, f, guiScrollableComponent.isMouseOver(i,j)?mouseScroll:0);
}
if(subgui != null)
subgui.drawScreen(i,j,f);
src/main/java/noppes/npcs/client/gui/util/GuiScrollableComponent.java
+186
View File
@@ -0,0 +1,186 @@
package noppes.npcs.client.gui.util;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.util.ChatComponentText;
import net.minecraft.util.ResourceLocation;
import noppes.npcs.client.gui.custom.GuiCustom;
import noppes.npcs.entity.EntityNPCInterface;
import noppes.npcs.scripted.CustomNPCsException;
import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11;
import java.util.Arrays;
public class GuiScrollableComponent extends GuiNPCInterface{
public static final ResourceLocation resource = new ResourceLocation("customnpcs","textures/gui/misc.png");
protected ScaledResolution scaledResolution;
public int clipWidth;
public int clipHeight;
protected int xPos = 0;
protected int yPos = 0;
protected int maxScrollY = 0;
protected float scrollY = 0;
protected float nextScrollY = 0;
private double lerp(double a, double b, double lambda){
return a + lambda * (b - a);
}
/**
* Scrollable GUI component :P?
* @param npc npc
* @param posX the X Position of the gui element on the screen
* @param posY the Y Position of the GUI element on the screen
* @param clipWidth width of the element
* @param clipHeight height of the element
* @param maxScroll extra Y area displayed through the scrollbar.
*/
public GuiScrollableComponent(EntityNPCInterface npc, int posX, int posY, int clipWidth, int clipHeight, int maxScroll){
super(npc);
this.xPos = posX;
this.yPos = posY;
this.clipWidth = clipWidth;
this.clipHeight = clipHeight;
this.maxScrollY = maxScroll;
}
@Override
public void save() {
}
@Override
public void initGui(){
super.initGui();
scaledResolution = new ScaledResolution(mc, mc.displayWidth, mc.displayHeight);
float scrollPerc = 0;
if((guiTop+clipHeight) != 0){
scrollPerc = (nextScrollY) / (clipHeight);
}
nextScrollY = scrollPerc * (clipHeight);
}
@Override
public void drawScreen(int mouseX, int mouseY, float partialTicks){
scrollY = (float) lerp(scrollY, nextScrollY, partialTicks);
if(Float.isNaN(scrollY))
scrollY = 0;
boolean drawBackground = this.drawDefaultBackground;
GL11.glPushMatrix();
//Enable clipping
GL11.glEnable(GL11.GL_SCISSOR_TEST);
setClip(xPos, yPos, clipWidth, clipHeight);
this.drawDefaultBackground = false;
if(drawBackground)
this.drawDefaultBackground();
if(maxScrollY > 0)
setClip(xPos, yPos, clipWidth-13, clipHeight);
GL11.glTranslatef(xPos, yPos-scrollY, 0);
super.drawScreen(mouseX-xPos, (int) (mouseY+scrollY-yPos), partialTicks);
this.drawDefaultBackground = drawBackground;
//Disable clipping (VERY IMPORTANT)
GL11.glDisable(GL11.GL_SCISSOR_TEST);
GL11.glTranslatef(-xPos, -yPos+scrollY, 0);
if(maxScrollY > 0){
drawScrollBar();
}
GL11.glPopMatrix();
}
public void drawScreen(int mouseX, int mouseY, float partialTicks, int mouseScroll){
adjustScroll(mouseScroll);
GuiNPCInterface.recordScroll = false;
this.drawScreen(mouseX, mouseY, partialTicks);
GuiNPCInterface.recordScroll = true;
}
private void drawScrollBar()
{
mc.renderEngine.bindTexture(resource);
GL11.glColor4f(1, 1, 1, 1);
int maxSize = (int) ((clipHeight) * ( (double) (clipHeight)/ maxScrollY))/2;
int x = xPos + clipWidth - 9;
int y = (int) (yPos + 4 + (scrollY/maxScrollY * (clipHeight-maxSize-8)));
for(int k = y; k < y+maxSize && k-clipHeight+maxSize < clipHeight;k++){
drawTexturedModalRect(x, k, 176, 9, 5, 1);
}
}
public void adjustScroll(int mouseScroll) {
nextScrollY -= (float) mouseScroll/25;
if(nextScrollY < 0)
nextScrollY = 0;
if(nextScrollY > maxScrollY) {
nextScrollY = maxScrollY;
}
}
@Override
public void addScrollableGui(int id, GuiScrollableComponent d){
throw new CustomNPCsException("You can't put scrollable GUIs into a scrollable GUI");
}
@Override
public void buttonEvent(GuiButton button){
mc.thePlayer.addChatMessage(new ChatComponentText("LOL"));
}
@Override
public void mouseClicked(int mouseX, int mouseY, int mouseButton){
super.mouseClicked(mouseX-xPos, (int) (mouseY-yPos+scrollY), mouseButton);
}
@Override
public void handleMouseInput(){
super.handleMouseInput();
adjustScroll(Mouse.getEventDWheel());
}
public boolean isMouseOver(int mouseX, int mouseY){
return mouseX >= xPos && mouseX <= clipWidth+xPos && mouseY >= yPos && mouseY <= clipHeight+yPos;
}
protected void setClip(int x, int y, int width, int height){
if(scaledResolution == null)
return;
int scaleFactor = scaledResolution.getScaleFactor();
//Correct the positions for Screen Space in OpenGL
x*=scaleFactor;
y*=scaleFactor;
width*=scaleFactor;
height*=scaleFactor;
//Adjust position to Top-Left origin (OpenGL window/screen space uses bottom-left origin)
y=mc.displayHeight-y;
//Set clip
GL11.glScissor(x, y-height, width, height);
}
}