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

add explosive items

Browse source
This commit is contained in:
Sen 2025-08-02 16:32:24 +02:00
parent ad83255833
commit 32d6f15c4a
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
30 changed files with 188 additions and 444 deletions
Download patch file Download diff file Expand all files Collapse all files

6
client/src/main/java/client/gui/container/GuiContainer.java
View file

@ -131,8 +131,14 @@ public abstract class GuiContainer extends Gui
list.add(Color.RED + "Admin-Gegenstand");
if(stack.getItem().isMagnetic())
list.add(Color.LIGHT_GRAY + "Magnetisch");
if(stack.getItem().isFragile())
list.add(Color.YELLOW + "Zerbrechlich");
if(stack.getItem().canBeDyed())
list.add("Farbe: #" + Integer.toHexString(stack.getDyeColor()).toUpperCase());
if(stack.getItem().getExplosive() > 0)
list.add(Color.RED + "Explosiv!" + Color.CRIMSON + " - " + Color.DARK_RED + stack.getItem().getExplosive() + "x");
if(stack.getItem().getFuelAmount() > 0)
list.add("Brennwert: " + stack.getItem().getFuelAmount());
if(stack.isItemEnchanted()) {
for(Entry<Enchantment, Integer> enc : stack.getEnchantments()) {

2
client/src/main/java/client/network/ClientPlayer.java
View file

@ -1191,7 +1191,7 @@ public class ClientPlayer implements IClientPlayer
// flag = true; // guicontainercreative.getSelectedTabIndex() != CheatTab.tabInventory.getIndex();
// }
if (packetIn.getWindowId() == 0 && packetIn.getSlot() >= 36 && packetIn.getSlot() < 45)
if (packetIn.getWindowId() == 0 && packetIn.getSlot() >= 5 + Equipment.ARMOR_SLOTS + 27 && packetIn.getSlot() < 5 + Equipment.ARMOR_SLOTS + 27 + 9)
{
ItemStack itemstack = entityplayer.inventoryContainer.getSlot(packetIn.getSlot()).getStack();

2
client/src/main/java/client/renderer/layers/LayerArmor.java
View file

@ -77,7 +77,7 @@ public class LayerArmor implements LayerRenderer<EntityNPC>
this.renderer.bindTexture(tex);
else
Client.CLIENT.getTextureManager().bindTexture(tex);
if (itemarmor.getArmorMaterial().canBeDyed())
if (itemarmor.canBeDyed())
{
int i = itemstack.getDyeColor();
float f = (float)(i >> 16 & 255) / 255.0F;