mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-22 15:29:54 +00:00
Merge branch 'dev' into syntax-highlighter-unified
This commit is contained in:
commit
3e1b4fd692
31 files changed
+381
-148
No files matched your search
@@ -419,7 +419,8 @@ public class ClientProxy extends CommonProxy {
|
||||
|
||||
@Override
|
||||
public PlayerData getPlayerData(EntityPlayer player) {
|
||||
if (player.getUniqueID() == Minecraft.getMinecraft().thePlayer.getUniqueID()) {
|
||||
EntityPlayer local = Minecraft.getMinecraft().thePlayer;
|
||||
if (local != null && player.getUniqueID().equals(local.getUniqueID())) {
|
||||
if (ClientCacheHandler.playerData != null) {
|
||||
if (ClientCacheHandler.playerData.player != player) {
|
||||
ClientCacheHandler.playerData.player = player;
|
||||
|
||||
@@ -28,7 +28,7 @@ public class GuiNpcPather extends GuiNPCInterface implements IGuiData {
|
||||
drawDefaultBackground = false;
|
||||
xSize = 176;
|
||||
title = "Npc Pather";
|
||||
setBackground("smallbg.png");
|
||||
setBackground("menubg.png");
|
||||
ai = npc.ais;
|
||||
PacketClient.sendClient(new MovingPathGetPacket());
|
||||
}
|
||||
|
||||
@@ -13,7 +13,7 @@ public class SubGuiAnimationFrame extends SubGuiInterface implements ITextfieldL
|
||||
|
||||
public SubGuiAnimationFrame(Frame editingFrame) {
|
||||
this.editingFrame = editingFrame;
|
||||
setBackground("smallbg.png");
|
||||
setBackground("menubg.png");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -11,7 +11,7 @@ public class SubGuiAnimationOptions extends SubGuiInterface {
|
||||
|
||||
public SubGuiAnimationOptions(Animation animation) {
|
||||
this.animation = animation;
|
||||
setBackground("smallbg.png");
|
||||
setBackground("menubg.png");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -11,7 +11,7 @@ public class SubGuiEditText extends SubGuiInterface {
|
||||
|
||||
public SubGuiEditText(String text) {
|
||||
this.text = text;
|
||||
setBackground("extrasmallbg.png");
|
||||
setBackground("menubg.png");
|
||||
closeOnEsc = true;
|
||||
xSize = 176;
|
||||
ySize = 71;
|
||||
|
||||
@@ -220,7 +220,7 @@ public class GuiFieldBuilder {
|
||||
float fVal = def.getValue() instanceof Number ? ((Number) def.getValue()).floatValue() : 0f;
|
||||
GuiNpcTextField tf = new GuiNpcTextField(widgetId, parent, fontRenderer, fieldX, y, fieldW, 20, String.valueOf(fVal));
|
||||
tf.setFloatsOnly();
|
||||
if (def.hasRange()) tf.setMinMaxDefaultFloat(def.getMin(), def.getMax(), fVal);
|
||||
tf.setMinMaxDefaultFloat(def.getMin(), def.getMax(), fVal);
|
||||
if (!def.isEnabled()) tf.setEnabled(false);
|
||||
if (hover != null) tf.setHoverText(hover);
|
||||
sw.addTextField(tf);
|
||||
@@ -233,7 +233,7 @@ public class GuiFieldBuilder {
|
||||
int iVal = def.getValue() instanceof Number ? ((Number) def.getValue()).intValue() : 0;
|
||||
GuiNpcTextField tf = new GuiNpcTextField(widgetId, parent, fontRenderer, fieldX, y, fieldW, 20, String.valueOf(iVal));
|
||||
tf.setIntegersOnly();
|
||||
if (def.hasRange()) tf.setMinMaxDefault((int) def.getMin(), (int) def.getMax(), iVal);
|
||||
tf.setMinMaxDefault((int) def.getMin(), (int) def.getMax(), iVal);
|
||||
if (!def.isEnabled()) tf.setEnabled(false);
|
||||
if (hover != null) tf.setHoverText(hover);
|
||||
sw.addTextField(tf);
|
||||
|
||||
@@ -15,7 +15,7 @@ import org.lwjgl.opengl.GL11;
|
||||
public class GuiQuestCompletion extends GuiNPCInterface implements ITopButtonListener {
|
||||
|
||||
private Quest quest;
|
||||
private final ResourceLocation resource = new ResourceLocation("customnpcs", "textures/gui/smallbg.png");
|
||||
private final ResourceLocation resource = new ResourceLocation("customnpcs", "textures/gui/menubg.png");
|
||||
|
||||
public GuiQuestCompletion(Quest quest) {
|
||||
super();
|
||||
|
||||
@@ -20,7 +20,7 @@ import java.util.Vector;
|
||||
|
||||
public class GuiTransportSelection extends GuiNPCInterface implements ITopButtonListener, IScrollData {
|
||||
|
||||
private final ResourceLocation resource = new ResourceLocation("customnpcs", "textures/gui/smallbg.png");
|
||||
private final ResourceLocation resource = new ResourceLocation("customnpcs", "textures/gui/menubg.png");
|
||||
protected int xSize;
|
||||
protected int guiLeft;
|
||||
protected int guiTop;
|
||||
|
||||
@@ -16,7 +16,7 @@ import org.lwjgl.opengl.GL11;
|
||||
import java.util.HashMap;
|
||||
|
||||
public class GuiScriptGlobal extends GuiNPCInterface implements IGuiData {
|
||||
private final ResourceLocation resource = new ResourceLocation("customnpcs", "textures/gui/smallbg.png");
|
||||
private final ResourceLocation resource = new ResourceLocation("customnpcs", "textures/gui/menubg.png");
|
||||
private HashMap<Integer, Class<?>> scriptGuiClasses = new HashMap<>();
|
||||
|
||||
public GuiScriptGlobal() {
|
||||
|
||||
@@ -15,7 +15,7 @@ public class SubGuiNpcCooldownPicker extends SubGuiInterface implements ITextfie
|
||||
public SubGuiNpcCooldownPicker(boolean isMCCustom, long currentCooldown) {
|
||||
this.isMCCustom = isMCCustom;
|
||||
this.cooldownValue = currentCooldown;
|
||||
setBackground("smallbg.png");
|
||||
setBackground("menubg.png");
|
||||
xSize = 220;
|
||||
ySize = 222;
|
||||
closeOnEsc = true;
|
||||
|
||||
Reference in new issue
Block a user