Merge pull request #111 from Goodbird-git/screen-size

Implemented the ability to get the screen size from server
This commit is contained in:
Kam authored and GitHub committed 2024-01-18 15:06:44 -05:00
commit f3e162dafe
6 files changed
+67 -1

No files matched your search

@@ -305,5 +305,9 @@ public class PacketHandlerPlayer{
tile.book.func_150996_a(Items.written_book);
}
}
else if(type == EnumPlayerPacket.ScreenSize){
int width = buffer.readInt(), height = buffer.readInt();
PlayerDataController.Instance.getPlayerData(player).screenSize.setSize(width,height);
}
}
}
@@ -22,6 +22,8 @@ import static noppes.npcs.client.ClientEventHandler.renderCNPCPlayer;
public class ClientTickHandler{
private World prevWorld;
private int prevWidth = 0;
private int prevHeight = 0;
private boolean otherContainer = false;
private int buttonPressed = -1;
private long buttonTime = 0L;
@@ -55,6 +57,11 @@ public class ClientTickHandler{
MusicController.Instance.stopMusic();
}
ScriptSoundController.Instance.onUpdate();
if(Minecraft.getMinecraft().thePlayer!=null && (prevWidth!=mc.displayWidth || prevHeight!=mc.displayHeight)){
prevWidth = mc.displayWidth;
prevHeight = mc.displayHeight;
NoppesUtilPlayer.sendData(EnumPlayerPacket.ScreenSize,mc.displayWidth,mc.displayHeight);
}
}
@SubscribeEvent
@@ -1,5 +1,5 @@
package noppes.npcs.constants;
public enum EnumPlayerPacket {
FollowerHire,FollowerExtend,Trader, FollowerState, Transport, BankUnlock, BankUpgrade, Dialog, QuestLog, CheckQuestCompletion, BankSlotOpen, FactionsGet, MailGet, MailDelete, MailSend, MailRead, MailboxOpenMail, SignSave, SaveBook, CompanionOpenInv, RoleGet, KeyPressed, MouseClicked, CompanionTalentExp
FollowerHire,FollowerExtend,Trader, FollowerState, Transport, BankUnlock, BankUpgrade, Dialog, QuestLog, CheckQuestCompletion, BankSlotOpen, FactionsGet, MailGet, MailDelete, MailSend, MailRead, MailboxOpenMail, SignSave, SaveBook, CompanionOpenInv, RoleGet, KeyPressed, MouseClicked, CompanionTalentExp, ScreenSize
}
@@ -18,6 +18,7 @@ import noppes.npcs.entity.data.DataSkinOverlays;
import noppes.npcs.entity.data.DataTimers;
import noppes.npcs.roles.RoleCompanion;
import noppes.npcs.scripted.NpcAPI;
import noppes.npcs.scripted.ScreenSize;
import noppes.npcs.util.CustomNPCsThreader;
import noppes.npcs.util.NBTJsonUtil;
@@ -52,6 +53,8 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
public boolean isGUIOpen = false;
public ScreenSize screenSize = new ScreenSize(-1,-1);
@Override
public void saveNBTData(NBTTagCompound nbtTagCompound) {
}
@@ -136,6 +139,14 @@ public class PlayerData implements IExtendedEntityProperties, IPlayerData {
return this.isGUIOpen;
}
public ScreenSize getScreenSize(){
return screenSize;
}
public void setScreenSize(ScreenSize size){
screenSize = size;
}
public boolean hasCompanion(){
return activeCompanion != null && !activeCompanion.isDead;
}
@@ -0,0 +1,38 @@
package noppes.npcs.scripted;
import noppes.npcs.api.IScreenSize;
public class ScreenSize implements IScreenSize {
private int width;
private int height;
public ScreenSize(int width, int height) {
this.width = width;
this.height = height;
}
public void setSize(int width, int height) {
this.width = width;
this.height = height;
}
@Override
public int getWidth() {
return width;
}
@Override
public int getHeight() {
return height;
}
@Override
public int getWidthPercent(double percent) {
return (int) (((double)width)*percent/100);
}
@Override
public int getHeightPercent(double percent) {
return (int) (((double)height)*percent/100);
}
}
@@ -679,6 +679,12 @@ public class ScriptPlayer<T extends EntityPlayerMP> extends ScriptLivingBase<T>
return PlayerDataController.Instance.getPlayerData(player).timers;
}
@Override
public IScreenSize getScreenSize() {
PlayerData data = PlayerDataController.Instance.getPlayerData(player);
return data.getScreenSize() ;
}
public void updatePlayerInventory() {
((EntityPlayerMP)this.entity).inventoryContainer.detectAndSendChanges();
PlayerData playerData = PlayerDataController.Instance.getPlayerData(player);