Extend GuiImage to allow for ResourceLocations
This commit is contained in:
@@ -27,6 +27,7 @@ import de.johni0702.minecraft.gui.RenderInfo;
|
|||||||
import de.johni0702.minecraft.gui.container.GuiContainer;
|
import de.johni0702.minecraft.gui.container.GuiContainer;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import net.minecraft.client.renderer.texture.DynamicTexture;
|
import net.minecraft.client.renderer.texture.DynamicTexture;
|
||||||
|
import net.minecraft.util.ResourceLocation;
|
||||||
import org.lwjgl.util.Dimension;
|
import org.lwjgl.util.Dimension;
|
||||||
import org.lwjgl.util.ReadableDimension;
|
import org.lwjgl.util.ReadableDimension;
|
||||||
|
|
||||||
@@ -35,6 +36,9 @@ import java.awt.image.BufferedImage;
|
|||||||
public abstract class AbstractGuiImage<T extends AbstractGuiImage<T>>
|
public abstract class AbstractGuiImage<T extends AbstractGuiImage<T>>
|
||||||
extends AbstractGuiElement<T> implements IGuiImage<T> {
|
extends AbstractGuiElement<T> implements IGuiImage<T> {
|
||||||
private DynamicTexture texture;
|
private DynamicTexture texture;
|
||||||
|
private ResourceLocation resourceLocation;
|
||||||
|
private int u, v;
|
||||||
|
private int uWidth, vHeight;
|
||||||
private int textureWidth, textureHeight;
|
private int textureWidth, textureHeight;
|
||||||
|
|
||||||
public AbstractGuiImage() {
|
public AbstractGuiImage() {
|
||||||
@@ -46,10 +50,14 @@ public abstract class AbstractGuiImage<T extends AbstractGuiImage<T>>
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) {
|
public void draw(GuiRenderer renderer, ReadableDimension size, RenderInfo renderInfo) {
|
||||||
renderer.bindTexture(texture);
|
if (texture != null) {
|
||||||
|
renderer.bindTexture(texture);
|
||||||
|
} else {
|
||||||
|
renderer.bindTexture(resourceLocation);
|
||||||
|
}
|
||||||
int w = size.getWidth();
|
int w = size.getWidth();
|
||||||
int h = size.getHeight();
|
int h = size.getHeight();
|
||||||
renderer.drawTexturedRect(0, 0, 0, 0, w, h, textureWidth, textureHeight, textureWidth, textureHeight);
|
renderer.drawTexturedRect(0, 0, u, v, w, h, uWidth, vHeight, textureWidth, textureHeight);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@@ -67,15 +75,71 @@ public abstract class AbstractGuiImage<T extends AbstractGuiImage<T>>
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public T setTexture(BufferedImage img) {
|
public T setTexture(BufferedImage img) {
|
||||||
|
resourceLocation = null;
|
||||||
if (texture != null) {
|
if (texture != null) {
|
||||||
texture.deleteGlTexture();
|
texture.deleteGlTexture();
|
||||||
}
|
}
|
||||||
texture = new DynamicTexture(img);
|
texture = new DynamicTexture(img);
|
||||||
textureWidth = img.getWidth();
|
textureWidth = uWidth = img.getWidth();
|
||||||
textureHeight = img.getHeight();
|
textureHeight = vHeight = img.getHeight();
|
||||||
return getThis();
|
return getThis();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public T setTexture(ResourceLocation resourceLocation) {
|
||||||
|
if (texture != null) {
|
||||||
|
texture.deleteGlTexture();
|
||||||
|
texture = null;
|
||||||
|
}
|
||||||
|
this.resourceLocation = resourceLocation;
|
||||||
|
textureWidth = textureHeight = 256;
|
||||||
|
return getThis();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public T setTexture(ResourceLocation resourceLocation, int u, int v, int width, int height) {
|
||||||
|
setTexture(resourceLocation);
|
||||||
|
setUV(u, v);
|
||||||
|
setUVSize(width, height);
|
||||||
|
return getThis();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public T setU(int u) {
|
||||||
|
this.u = u;
|
||||||
|
return getThis();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public T setV(int v) {
|
||||||
|
this.v = v;
|
||||||
|
return getThis();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public T setUV(int u, int v) {
|
||||||
|
setU(u);
|
||||||
|
return setV(v);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public T setUWidth(int width) {
|
||||||
|
this.uWidth = width;
|
||||||
|
return getThis();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public T setVHeight(int height) {
|
||||||
|
this.vHeight = height;
|
||||||
|
return getThis();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public T setUVSize(int width, int height) {
|
||||||
|
setUWidth(width);
|
||||||
|
return setVHeight(height);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* We use a static class here in order to prevent the inner class from keeping the outer class
|
* We use a static class here in order to prevent the inner class from keeping the outer class
|
||||||
* alive after finalization when still unloading the texture.
|
* alive after finalization when still unloading the texture.
|
||||||
|
|||||||
@@ -22,8 +22,20 @@
|
|||||||
|
|
||||||
package de.johni0702.minecraft.gui.element;
|
package de.johni0702.minecraft.gui.element;
|
||||||
|
|
||||||
|
import net.minecraft.util.ResourceLocation;
|
||||||
|
|
||||||
import java.awt.image.BufferedImage;
|
import java.awt.image.BufferedImage;
|
||||||
|
|
||||||
public interface IGuiImage<T extends IGuiImage<T>> extends GuiElement<T> {
|
public interface IGuiImage<T extends IGuiImage<T>> extends GuiElement<T> {
|
||||||
T setTexture(BufferedImage img);
|
T setTexture(BufferedImage img);
|
||||||
|
T setTexture(ResourceLocation resourceLocation);
|
||||||
|
T setTexture(ResourceLocation resourceLocation, int u, int v, int width, int height);
|
||||||
|
|
||||||
|
T setU(int u);
|
||||||
|
T setV(int v);
|
||||||
|
T setUV(int u, int v);
|
||||||
|
|
||||||
|
T setUWidth(int width);
|
||||||
|
T setVHeight(int height);
|
||||||
|
T setUVSize(int width, int height);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user