Merge branch 'dev'

This commit is contained in:
KAMKEEL committed 2022-07-03 16:49:53 -04:00
commit 515b9f2d99
5 files changed
+79 -59

No files matched your search

@@ -240,7 +240,7 @@ public class PacketHandlerServer{
private void itemScriptPackets(EnumPacketServer type, ByteBuf buffer, EntityPlayerMP player) throws Exception {
if (type == EnumPacketServer.ScriptItemDataGet) {
ScriptCustomItem iw = new ScriptCustomItem(player.getHeldItem());
ScriptCustomItem iw = (ScriptCustomItem) NpcAPI.Instance().getIItemStack(player.getHeldItem());
NBTTagCompound compound = iw.getMCNbt();
compound.setTag("Languages", ScriptController.Instance.nbtLanguages());
Server.sendData(player, EnumPacketClient.GUI_DATA, new Object[]{compound});
@@ -250,7 +250,7 @@ public class PacketHandlerServer{
}
NBTTagCompound compound = Server.readNBT(buffer);
ScriptCustomItem wrapper = new ScriptCustomItem(player.getHeldItem());
ScriptCustomItem wrapper = (ScriptCustomItem) NpcAPI.Instance().getIItemStack(player.getHeldItem());
wrapper.setMCNbt(compound);
wrapper.lastInited = -1L;
wrapper.saveScriptData();
@@ -58,26 +58,28 @@ public class ClientEventHandler {
@SubscribeEvent
public void onRenderPlayer(RenderPlayerEvent.Post event) {
try {
Class<?> renderPlayerJBRA = Class.forName("JinRyuu.JBRA.RenderPlayerJBRA");
if (renderPlayerJBRA.isInstance(event.renderer))
return;
} catch (Exception ignored) {}
if (hasOverlays(event.entityPlayer)) {
try {
Class<?> renderPlayerJBRA = Class.forName("JinRyuu.JBRA.RenderPlayerJBRA");
if (renderPlayerJBRA.isInstance(event.renderer))
return;
} catch (ClassNotFoundException ignored) {}
if (!(event.renderer instanceof RenderCNPCPlayer)) {
renderCNPCPlayer.tempRenderPartialTicks = event.partialRenderTick;
double d0 = event.entityPlayer.lastTickPosX + (event.entityPlayer.posX - event.entityPlayer.lastTickPosX) * (double)event.partialRenderTick - RenderManager.renderPosX;
double d1 = event.entityPlayer.lastTickPosY + (event.entityPlayer.posY - event.entityPlayer.lastTickPosY) * (double)event.partialRenderTick - RenderManager.renderPosY;
double d2 = event.entityPlayer.lastTickPosZ + (event.entityPlayer.posZ - event.entityPlayer.lastTickPosZ) * (double)event.partialRenderTick - RenderManager.renderPosZ;
float f1 = event.entityPlayer.prevRotationYaw + (event.entityPlayer.rotationYaw - event.entityPlayer.prevRotationYaw) * event.partialRenderTick;
if (!(event.renderer instanceof RenderCNPCPlayer)) {
renderCNPCPlayer.tempRenderPartialTicks = event.partialRenderTick;
double d0 = event.entityPlayer.lastTickPosX + (event.entityPlayer.posX - event.entityPlayer.lastTickPosX) * (double) event.partialRenderTick - RenderManager.renderPosX;
double d1 = event.entityPlayer.lastTickPosY + (event.entityPlayer.posY - event.entityPlayer.lastTickPosY) * (double) event.partialRenderTick - RenderManager.renderPosY;
double d2 = event.entityPlayer.lastTickPosZ + (event.entityPlayer.posZ - event.entityPlayer.lastTickPosZ) * (double) event.partialRenderTick - RenderManager.renderPosZ;
float f1 = event.entityPlayer.prevRotationYaw + (event.entityPlayer.rotationYaw - event.entityPlayer.prevRotationYaw) * event.partialRenderTick;
if (Minecraft.getMinecraft().thePlayer.equals(event.entityPlayer)) {
d0 = 0;
d1 = 0;
d2 = 0;
if (Minecraft.getMinecraft().thePlayer.equals(event.entityPlayer)) {
d0 = 0;
d1 = 0;
d2 = 0;
}
renderCNPCPlayer.doRender(event.entityPlayer, d0, d1, d2, f1, event.partialRenderTick);
}
renderCNPCPlayer.doRender(event.entityPlayer, d0, d1, d2, f1, event.partialRenderTick);
}
}
@@ -90,34 +92,42 @@ public class ClientEventHandler {
@SubscribeEvent
public void tryRenderDBC(RenderPlayerEvent.Specials.Post event) {
try {
Class<?> renderPlayerJBRA = Class.forName("JinRyuu.JBRA.RenderPlayerJBRA");
if (!renderPlayerJBRA.isInstance(event.renderer))
if (hasOverlays(event.entityPlayer)) {
try {
Class<?> renderPlayerJBRA = Class.forName("JinRyuu.JBRA.RenderPlayerJBRA");
if (!renderPlayerJBRA.isInstance(event.renderer))
return;
} catch (ClassNotFoundException ignored) {
return;
} catch (Exception ignored) {}
}
renderCNPCPlayer.renderDBCModel(event);
renderCNPCPlayer.renderDBCModel(event);
}
}
@SubscribeEvent
public void onClientTick(TickEvent.ClientTickEvent event) {
Minecraft mc = Minecraft.getMinecraft();
if (mc.thePlayer != null && mc.theWorld != null && !mc.isGamePaused() && event.phase == TickEvent.Phase.END) {
renderCNPCPlayer.itemRenderer.updateEquippedItem();
renderCNPCPlayer.updateFovModifierHand();
if (hasOverlays(mc.thePlayer)) {
if (mc.thePlayer != null && mc.theWorld != null && !mc.isGamePaused() && event.phase == TickEvent.Phase.END) {
renderCNPCPlayer.itemRenderer.updateEquippedItem();
renderCNPCPlayer.updateFovModifierHand();
}
}
}
@SubscribeEvent
public void onRenderHand(RenderHandEvent event) {
if (Client.skinOverlays.containsKey(Minecraft.getMinecraft().thePlayer.getUniqueID()) && Client.skinOverlays.get(Minecraft.getMinecraft().thePlayer.getUniqueID()).values().size() > 0) {
if (hasOverlays(Minecraft.getMinecraft().thePlayer)) {
GL11.glPushMatrix();
event.setCanceled(true);
GL11.glClear(GL11.GL_DEPTH_BUFFER_BIT);
renderCNPCPlayer.renderHand(event.partialTicks, event.renderPass);
GL11.glPopMatrix();
} else {
event.setCanceled(false);
}
}
private boolean hasOverlays(EntityPlayer player) {
return Client.skinOverlays.containsKey(player.getUniqueID()) && Client.skinOverlays.get(player.getUniqueID()).values().size() > 0;
}
}
@@ -387,6 +387,9 @@ public class GuiScriptInterface extends GuiNPCInterface implements GuiYesNoCallb
container.script = "";
} else {
this.handler.clearConsole();
if (this.handler instanceof ScriptCustomItem) {
((ScriptCustomItem) this.handler).saveScriptData();
}
}
this.initGui();
@@ -71,8 +71,9 @@ public class ItemScripted extends Item implements ItemRenderInterface {
@Override
public boolean onEntitySwing(EntityLivingBase entityLivingBase, ItemStack stack){
if(entityLivingBase instanceof EntityClientPlayerMP)
if (entityLivingBase.worldObj.isRemote) {
return false;
}
IItemStack istack = NpcAPI.Instance().getIItemStack(stack);
ItemEvent.AttackEvent eve = new ItemEvent.AttackEvent( (ScriptCustomItem) istack, NpcAPI.Instance().getIEntity(entityLivingBase), 2, null);
@@ -16,6 +16,8 @@ import java.util.*;
public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IScriptHandler {
public List<ScriptContainer> scripts = new ArrayList();
public List<Integer> errored = new ArrayList();
private Map<Long, String> console = new TreeMap();
public String scriptLanguage = "ECMAScript";
public boolean enabled = false;
public long lastInited = -1L;
@@ -53,6 +55,7 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IS
compound.setTag("Scripts", NBTTags.NBTScript(this.scripts));
compound.setString("ScriptLanguage", this.scriptLanguage);
compound.setBoolean("ScriptEnabled", this.enabled);
compound.setTag("ScriptConsole", NBTTags.NBTLongStringMap(this.console));
return compound;
}
@@ -61,6 +64,7 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IS
this.scripts = NBTTags.GetScript(compound.getTagList("Scripts", 10), this);
this.scriptLanguage = compound.getString("ScriptLanguage");
this.enabled = compound.getBoolean("ScriptEnabled");
this.console = NBTTags.GetLongStringMap(compound.getTagList("ScriptConsole", 10));
}
}
@@ -82,13 +86,36 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IS
}
}
Iterator var3 = this.scripts.iterator();
for (int i = 0; i < this.scripts.size(); i++) {
ScriptContainer script = this.scripts.get(i);
if (!this.errored.contains(i)) {
if(script == null || script.errored || !script.hasCode())
return;
while(var3.hasNext()) {
ScriptContainer script = (ScriptContainer)var3.next();
script.run(type, event);
script.run(type, event);
if (script.errored) {
this.errored.add(i);
}
Iterator var8 = script.console.entrySet().iterator();
boolean saveConsoleData = false;
while(var8.hasNext()) {
Map.Entry<Long, String> entry = (Map.Entry)var8.next();
if (!this.console.containsKey(entry.getKey())) {
this.console.put(entry.getKey(), " tab " + (i + 1) + ":\n" + (String)entry.getValue());
saveConsoleData = true;
}
}
script.console.clear();
if (saveConsoleData) {
saveScriptData();
}
}
}
}
}
@@ -125,32 +152,11 @@ public class ScriptCustomItem extends ScriptItemStack implements IItemCustom, IS
}
public Map<Long, String> getConsoleText() {
Map<Long, String> map = new TreeMap();
int tab = 0;
Iterator var3 = this.getScripts().iterator();
while(var3.hasNext()) {
ScriptContainer script = (ScriptContainer)var3.next();
++tab;
Iterator var5 = script.console.entrySet().iterator();
while(var5.hasNext()) {
Map.Entry<Long, String> entry = (Map.Entry)var5.next();
map.put(entry.getKey(), " tab " + tab + ":\n" + (String)entry.getValue());
}
}
return map;
return this.console;
}
public void clearConsole() {
Iterator var1 = this.getScripts().iterator();
while(var1.hasNext()) {
ScriptContainer script = (ScriptContainer)var1.next();
script.console.clear();
}
this.console.clear();
}
public String getTexture() {