sen/tcr
sen/tcr
1
0
Fork 0
Code Issues Pull requests Activity

change nbt format

Browse source
This commit is contained in:
Sen 2025-05-27 21:25:11 +02:00
parent ad4949af16
commit 17aad1f023
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
124 changed files with 2063 additions and 2986 deletions
Download patch file Download diff file Expand all files Collapse all files

12
client/src/main/java/client/gui/container/GuiMerchant.java
View file

@ -81,9 +81,9 @@ public class GuiMerchant extends GuiContainer
if (merchantrecipelist != null && !merchantrecipelist.isEmpty()) {
int k = this.selectedMerchantRecipe;
MerchantRecipe merchantrecipe = (MerchantRecipe)merchantrecipelist.get(k);
ItemStack itemstack = merchantrecipe.getItemToBuy();
ItemStack itemstack1 = merchantrecipe.getSecondItemToBuy();
ItemStack itemstack2 = merchantrecipe.getItemToSell();
ItemStack itemstack = merchantrecipe.getBuying();
ItemStack itemstack1 = merchantrecipe.getSecondBuy();
ItemStack itemstack2 = merchantrecipe.getSelling();
this.renderItemOverlayIntoGUI(itemstack, 36, 24, null);
if(itemstack1 != null)
this.renderItemOverlayIntoGUI(itemstack1, 62, 24, null);
@ -180,9 +180,9 @@ public class GuiMerchant extends GuiContainer
// int j = (this.height - this.ySize) / 2;
int k = this.selectedMerchantRecipe;
MerchantRecipe merchantrecipe = (MerchantRecipe)merchantrecipelist.get(k);
ItemStack itemstack = merchantrecipe.getItemToBuy();
ItemStack itemstack1 = merchantrecipe.getSecondItemToBuy();
ItemStack itemstack2 = merchantrecipe.getItemToSell();
ItemStack itemstack = merchantrecipe.getBuying();
ItemStack itemstack1 = merchantrecipe.getSecondBuy();
ItemStack itemstack2 = merchantrecipe.getSelling();
GL11.glPushMatrix();
ItemRenderer.enableGUIStandardItemLighting();
GlState.disableLighting();

30
client/src/main/java/client/renderer/particle/EntityFirework.java
View file

@ -7,7 +7,7 @@ import common.entity.Entity;
import common.init.SoundEvent;
import common.item.ItemDye;
import common.nbt.NBTTagCompound;
import common.nbt.NBTTagList;
import common.nbt.NBTTagTagList;
import common.util.BoundingBox;
import common.util.ExtMath;
import common.world.World;
@ -192,7 +192,7 @@ public class EntityFirework
{
private int fireworkAge;
private final EffectRenderer theEffectRenderer;
private NBTTagList fireworkExplosions;
private NBTTagTagList fireworkExplosions;
boolean twinkle;
public StarterFX(World p_i46464_1_, double p_i46464_2_, double p_i46464_4_, double p_i46464_6_, double p_i46464_8_, double p_i46464_10_, double p_i46464_12_, EffectRenderer p_i46464_14_, NBTTagCompound p_i46464_15_)
@ -206,21 +206,21 @@ public class EntityFirework
if (p_i46464_15_ != null)
{
this.fireworkExplosions = p_i46464_15_.getTagList("Explosions", 10);
this.fireworkExplosions = p_i46464_15_.getTagList("Explosions");
if (this.fireworkExplosions.tagCount() == 0)
if (this.fireworkExplosions.size() == 0)
{
this.fireworkExplosions = null;
}
else
{
this.particleMaxAge = this.fireworkExplosions.tagCount() * 2 - 1;
this.particleMaxAge = this.fireworkExplosions.size() * 2 - 1;
for (int i = 0; i < this.fireworkExplosions.tagCount(); ++i)
for (int i = 0; i < this.fireworkExplosions.size(); ++i)
{
NBTTagCompound nbttagcompound = this.fireworkExplosions.getCompoundTagAt(i);
NBTTagCompound nbttagcompound = this.fireworkExplosions.getTag(i);
if (nbttagcompound.getBoolean("Flicker"))
if (nbttagcompound.getBool("Flicker"))
{
this.twinkle = true;
this.particleMaxAge += 15;
@ -242,15 +242,15 @@ public class EntityFirework
boolean flag = this.isFarAway();
boolean flag1 = false;
if (this.fireworkExplosions.tagCount() >= 3)
if (this.fireworkExplosions.size() >= 3)
{
flag1 = true;
}
else
{
for (int i = 0; i < this.fireworkExplosions.tagCount(); ++i)
for (int i = 0; i < this.fireworkExplosions.size(); ++i)
{
NBTTagCompound nbttagcompound = this.fireworkExplosions.getCompoundTagAt(i);
NBTTagCompound nbttagcompound = this.fireworkExplosions.getTag(i);
if (nbttagcompound.getByte("Type") == 1)
{
@ -265,13 +265,13 @@ public class EntityFirework
((WorldClient)this.worldObj).playSound(this.posX, this.posY, this.posZ, s1, 20.0F);
}
if (this.fireworkAge % 2 == 0 && this.fireworkExplosions != null && this.fireworkAge / 2 < this.fireworkExplosions.tagCount())
if (this.fireworkAge % 2 == 0 && this.fireworkExplosions != null && this.fireworkAge / 2 < this.fireworkExplosions.size())
{
int k = this.fireworkAge / 2;
NBTTagCompound nbttagcompound1 = this.fireworkExplosions.getCompoundTagAt(k);
NBTTagCompound nbttagcompound1 = this.fireworkExplosions.getTag(k);
int l = nbttagcompound1.getByte("Type");
boolean flag4 = nbttagcompound1.getBoolean("Trail");
boolean flag2 = nbttagcompound1.getBoolean("Flicker");
boolean flag4 = nbttagcompound1.getBool("Trail");
boolean flag2 = nbttagcompound1.getBool("Flicker");
int[] aint = nbttagcompound1.getIntArray("Colors");
int[] aint1 = nbttagcompound1.getIntArray("FadeColors");

2
client/src/main/java/client/renderer/tileentity/TileEntityItemStackRenderer.java
View file

@ -36,7 +36,7 @@ public class TileEntityItemStackRenderer
// {
// NBTTagCompound nbttagcompound = itemStackIn.getTagCompound();
//
// if (nbttagcompound.hasKey("SkullOwner", 8) && nbttagcompound.getString("SkullOwner").length() > 0)
// if (nbttagcompound.hasString("SkullOwner") && nbttagcompound.getString("SkullOwner").length() > 0)
// {
// user = nbttagcompound.getString("SkullOwner");
// }