sen/tcr
sen/tcr
1
0
Fork 0
Code Activity

misc fixes

Browse source
This commit is contained in:
Sen 2025-09-01 11:40:38 +02:00
parent 06f1604660
commit c43be27dc3
Signed by: sen
GPG key ID: 3AC50A6F47D1B722
9 changed files with 22 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
common/src/main/java/common/block/Block.java
View file

@ -1096,6 +1096,8 @@ public class Block {
@Clientside @Clientside
public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) { public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) {
if(this.light != 0)
tooltip.add(Color.BLUE + "Licht" + Color.DARK_GRAY + ": " + Color.NEON + String.format("%06x", this.light));
} }
@Clientside @Clientside

1
common/src/main/java/common/block/artificial/BlockMetalBlock.java
View file

@ -35,6 +35,7 @@ public class BlockMetalBlock extends Block {
public void getTooltips(ItemStack stack, EntityNPC playerIn, List<String> tooltip) public void getTooltips(ItemStack stack, EntityNPC playerIn, List<String> tooltip)
{ {
super.getTooltips(stack, playerIn, tooltip);
tooltip.add(this.metal.formatSymbol()); tooltip.add(this.metal.formatSymbol());
if(this.metal.radioactivity > 0.0f) { if(this.metal.radioactivity > 0.0f) {
tooltip.add(this.metal.formatRadioactivity()); tooltip.add(this.metal.formatRadioactivity());

1
common/src/main/java/common/block/natural/BlockCompressable.java
View file

@ -38,6 +38,7 @@ public class BlockCompressable extends Block {
@Clientside @Clientside
public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) { public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) {
super.getTooltips(stack, player, tooltip);
if(this.compLevel > 0) if(this.compLevel > 0)
tooltip.add(Color.YELLOW + "" + this.compLevel + "-Fach komprimiert"); tooltip.add(Color.YELLOW + "" + this.compLevel + "-Fach komprimiert");
} }

1
common/src/main/java/common/block/natural/BlockMetalOre.java
View file

@ -29,6 +29,7 @@ public class BlockMetalOre extends BlockOre {
public void getTooltips(ItemStack stack, EntityNPC playerIn, List<String> tooltip) public void getTooltips(ItemStack stack, EntityNPC playerIn, List<String> tooltip)
{ {
super.getTooltips(stack, playerIn, tooltip);
tooltip.add(this.metal.formatSymbol()); tooltip.add(this.metal.formatSymbol());
if(this.metal.radioactivity > 0.0f) { if(this.metal.radioactivity > 0.0f) {
tooltip.add(this.metal.formatRadioactivity()); tooltip.add(this.metal.formatRadioactivity());

1
common/src/main/java/common/block/tech/BlockChest.java
View file

@ -260,6 +260,7 @@ public class BlockChest extends Block implements ITileEntityProvider, Rotatable
@Clientside @Clientside
public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) { public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) {
super.getTooltips(stack, player, tooltip);
tooltip.add(Color.DARK_GREEN + "Kapazität" + Color.DARK_GRAY + ": " + Color.GREEN + (this.width * this.height)); tooltip.add(Color.DARK_GREEN + "Kapazität" + Color.DARK_GRAY + ": " + Color.GREEN + (this.width * this.height));
} }

1
common/src/main/java/common/block/tech/BlockFurnace.java
View file

@ -159,6 +159,7 @@ public class BlockFurnace extends BlockMachine {
@Clientside @Clientside
public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) { public void getTooltips(ItemStack stack, EntityNPC player, List<String> tooltip) {
super.getTooltips(stack, player, tooltip);
tooltip.add(Color.DARK_GREEN + "Schmelzzeit: " + Color.GREEN + (this.burnTime / 20) + " s"); tooltip.add(Color.DARK_GREEN + "Schmelzzeit: " + Color.GREEN + (this.burnTime / 20) + " s");
tooltip.add(Color.CYAN + "Effizienz: " + Color.NEON + this.fuelEfficiency + " %"); tooltip.add(Color.CYAN + "Effizienz: " + Color.NEON + this.fuelEfficiency + " %");
} }

2
common/src/main/java/common/init/BlockRegistry.java
View file

@ -186,7 +186,7 @@ public abstract class BlockRegistry {
registerFluid("acid", "Säure", LiquidType.HOT, 0, 5, 0.0f, 1, 1); registerFluid("acid", "Säure", LiquidType.HOT, 0, 5, 0.0f, 1, 1);
registerFluid("slime", "Schleim", LiquidType.COLD, 0, 50, 0.0f, 8, 4); registerFluid("slime", "Schleim", LiquidType.COLD, 0, 50, 0.0f, 8, 4);
registerFluid("goo", "Klebrige Masse", LiquidType.COLD, 0, 60, 0.0f, 10, 5); registerFluid("goo", "Klebrige Masse", LiquidType.COLD, 0, 60, 0.0f, 10, 5);
registerFluid("nukage", "Radioaktive Masse", LiquidType.COLD, 10, 10, 4.0f, 2, 2); registerFluid("nukage", "Radioaktive Masse", LiquidType.COLD, 0x00ff00, 10, 4.0f, 2, 2);
registerFluid("blood", "Blut", LiquidType.COLD, 0, 10, 0.0f, 2, 1); registerFluid("blood", "Blut", LiquidType.COLD, 0, 10, 0.0f, 2, 1);
registerFluid("spring_water", "Klares Wasser", LiquidType.COLD, 0, 5, 0.0f, 1, 1); registerFluid("spring_water", "Klares Wasser", LiquidType.COLD, 0, 5, 0.0f, 1, 1);
registerFluid("swamp_water", "Sumpfwasser", LiquidType.COLD, 0, 5, 0.0f, TextureAnimation.SWAMP_WATER_STILL, TextureAnimation.SWAMP_WATER_FLOW); registerFluid("swamp_water", "Sumpfwasser", LiquidType.COLD, 0, 5, 0.0f, TextureAnimation.SWAMP_WATER_STILL, TextureAnimation.SWAMP_WATER_FLOW);

10
common/src/main/java/common/item/material/ItemBucket.java
View file

@ -27,6 +27,7 @@ import common.tileentity.TileEntity;
import common.tileentity.DeviceDispenser; import common.tileentity.DeviceDispenser;
import common.util.BlockPos; import common.util.BlockPos;
import common.util.Clientside; import common.util.Clientside;
import common.util.Color;
import common.util.Facing; import common.util.Facing;
import common.util.HitPosition; import common.util.HitPosition;
import common.util.ParticleType; import common.util.ParticleType;
@ -116,10 +117,10 @@ public class ItemBucket extends Item
{ {
if(liquid != null) { if(liquid != null) {
this.setUnstackable(); this.setUnstackable();
this.setDisplay((recursive ? "Flutender" : "") + "Eimer mit " + liquid.getDisplay(), liquid.getDescription()); this.setDisplay((recursive ? "Flutender " : "") + "Eimer mit " + liquid.getDisplay(), liquid.getDescription());
} }
else { else {
this.setDisplay((recursive ? "Unendlicher" : "") + "Eimer"); this.setDisplay((recursive ? "Unendlicher " : "") + "Eimer");
} }
this.liquid = liquid; this.liquid = liquid;
this.recursive = recursive; this.recursive = recursive;
@ -142,6 +143,11 @@ public class ItemBucket extends Item
map.put(Attribute.RADIATION, -5.0f); map.put(Attribute.RADIATION, -5.0f);
} }
public void addInformation(ItemStack stack, EntityNPC playerIn, List<String> tooltip) {
if(this.liquid != null)
this.liquid.getTooltips(stack, playerIn, tooltip);
}
/** /**
* Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer * Called whenever this item is equipped and the right mouse button is pressed. Args: itemStack, world, entityPlayer
*/ */

6
common/src/main/java/common/item/tool/ItemFire.java
View file

@ -1,5 +1,7 @@
package common.item.tool; package common.item.tool;
import java.util.List;
import common.block.natural.BlockFire; import common.block.natural.BlockFire;
import common.block.tech.BlockTNT; import common.block.tech.BlockTNT;
import common.entity.npc.EntityNPC; import common.entity.npc.EntityNPC;
@ -28,6 +30,10 @@ public class ItemFire extends Item
this.setMagnetic(); this.setMagnetic();
} }
public void addInformation(ItemStack stack, EntityNPC playerIn, List<String> tooltip) {
this.fireBlock.getTooltips(stack, playerIn, tooltip);
}
/** /**
* Called when a Block is right-clicked with this Item * Called when a Block is right-clicked with this Item
*/ */