mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-21 21:02:24 +00:00
Further simplify IChiselItem and improve chisel tooltips
This commit is contained in:
1 parent
25dc76a739
commit
047df88793
6 files changed
+43
-29
No files matched your search
@@ -14,11 +14,11 @@ import org.apache.commons.lang3.ArrayUtils;
|
||||
|
||||
import com.cricketcraft.chisel.Chisel;
|
||||
import com.cricketcraft.chisel.PacketHandler;
|
||||
import com.cricketcraft.chisel.api.ChiselMode;
|
||||
import com.cricketcraft.chisel.api.IChiselItem;
|
||||
import com.cricketcraft.chisel.carving.Carving;
|
||||
import com.cricketcraft.chisel.carving.CarvingVariation;
|
||||
import com.cricketcraft.chisel.client.GeneralChiselClient;
|
||||
import com.cricketcraft.chisel.utils.General;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
import cpw.mods.fml.common.network.simpleimpl.IMessage;
|
||||
@@ -56,7 +56,7 @@ public final class ChiselController {
|
||||
CarvingVariation[] variations = Carving.chisel.getVariations(block, metadata);
|
||||
|
||||
if (variations != null) {
|
||||
ItemStack target = ((IChiselItem) held.getItem()).getTarget(held);
|
||||
ItemStack target = General.getChiselTarget(held);
|
||||
|
||||
if (target != null) {
|
||||
for (CarvingVariation v : variations) {
|
||||
|
||||
@@ -59,7 +59,15 @@ public class ItemChisel extends Item implements IChiselItem {
|
||||
@SuppressWarnings({ "unchecked", "rawtypes" })
|
||||
@Override
|
||||
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean held) {
|
||||
list.add(StatCollector.translateToLocal(getUnlocalizedName(stack) + ".desc"));
|
||||
String unloc = "item.chisel.chisel.desc.";
|
||||
for (int i = 0; i < 3; i ++) {
|
||||
list.add(StatCollector.translateToLocal(unloc + i));
|
||||
}
|
||||
|
||||
if (type == ChiselType.DIAMOND) {
|
||||
list.add("");
|
||||
list.add(StatCollector.translateToLocal(getUnlocalizedName(stack) + ".desc"));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -88,10 +96,4 @@ public class ItemChisel extends Item implements IChiselItem {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getTarget(ItemStack chisel) {
|
||||
return chisel.hasTagCompound() ? ItemStack.loadItemStackFromNBT(chisel.stackTagCompound.getCompoundTag("chiselTarget")) : null;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user