mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-21 04:32:24 +00:00
Load non-damage ET items
This commit is contained in:
1 parent
ce71fe4912
commit
37fda09964
7 files changed
+36
-18
No files matched your search
@@ -5,7 +5,5 @@ import net.minecraft.item.ItemStack;
|
||||
|
||||
public interface IToolHammer {
|
||||
|
||||
boolean isActive(ItemStack stack);
|
||||
|
||||
void onHammerUsed(ItemStack stack, EntityPlayer player);
|
||||
}
|
||||
@@ -60,8 +60,7 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo
|
||||
}
|
||||
|
||||
ItemStack item = player.getHeldItem();
|
||||
if (item == null || !(item.getItem() instanceof IToolHammer)
|
||||
|| !((IToolHammer) item.getItem()).isActive(item)) {
|
||||
if (item == null || !(item.getItem() instanceof IToolHammer)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package binnie.extratrees.item;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -22,9 +23,13 @@ public class ItemDictionary extends Item {
|
||||
protected IIcon iconMaster;
|
||||
|
||||
public ItemDictionary() {
|
||||
final String name = "database";
|
||||
|
||||
setCreativeTab(Tabs.tabArboriculture);
|
||||
setUnlocalizedName("database");
|
||||
setUnlocalizedName(name);
|
||||
setMaxStackSize(1);
|
||||
|
||||
GameRegistry.registerItem(this, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package binnie.extratrees.item;
|
||||
|
||||
import binnie.core.item.IItemMisc;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import forestry.api.core.Tabs;
|
||||
@@ -17,10 +18,14 @@ public class ItemFood extends net.minecraft.item.ItemFood {
|
||||
|
||||
public ItemFood() {
|
||||
super(0, 0.0f, false);
|
||||
setUnlocalizedName("food");
|
||||
final String name = "food";
|
||||
|
||||
setUnlocalizedName(name);
|
||||
setCreativeTab(Tabs.tabArboriculture);
|
||||
setHasSubtypes(true);
|
||||
items = Food.values();
|
||||
|
||||
GameRegistry.registerItem(this, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package binnie.extratrees.item;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.creativetab.CreativeTabs;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
@@ -14,31 +15,31 @@ import cpw.mods.fml.relauncher.SideOnly;
|
||||
|
||||
public class ItemHammer extends Item implements IToolHammer {
|
||||
|
||||
private final String name;
|
||||
protected boolean isDurableHammer;
|
||||
|
||||
public ItemHammer(boolean durable) {
|
||||
name = durable ? "durableHammer" : "hammer";
|
||||
|
||||
isDurableHammer = durable;
|
||||
setCreativeTab(CreativeTabs.tabTools);
|
||||
setUnlocalizedName(durable ? "durableHammer" : "hammer");
|
||||
setUnlocalizedName(name);
|
||||
setMaxStackSize(1);
|
||||
setMaxDamage(durable ? 1562 : 251);
|
||||
|
||||
GameRegistry.registerItem(this, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerIcons(IIconRegister register) {
|
||||
itemIcon = ExtraTrees.proxy.getIcon(register, isDurableHammer ? "durableHammer" : "carpentryHammer");
|
||||
itemIcon = ExtraTrees.proxy.getIcon(register, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getItemStackDisplayName(ItemStack i) {
|
||||
return isDurableHammer ? I18N.localise("extratrees.item.masterCarpentryHammer")
|
||||
: I18N.localise("extratrees.item.carpentryHammer");
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isActive(ItemStack stack) {
|
||||
return true;
|
||||
return isDurableHammer ? I18N.localise("extratrees.item.masterCarpentryHammer.name")
|
||||
: I18N.localise("extratrees.item.carpentryHammer.name");
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package binnie.extratrees.item;
|
||||
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import java.util.List;
|
||||
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
@@ -22,9 +23,13 @@ public class ItemMothDatabase extends Item {
|
||||
protected IIcon iconMaster;
|
||||
|
||||
public ItemMothDatabase() {
|
||||
final String name = "databaseMoth";
|
||||
|
||||
setCreativeTab(Tabs.tabLepidopterology);
|
||||
setUnlocalizedName("databaseMoth");
|
||||
setUnlocalizedName(name);
|
||||
setMaxStackSize(1);
|
||||
|
||||
GameRegistry.registerItem(this, name);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
package binnie.extratrees.item;
|
||||
|
||||
import static binnie.extratrees.item.ETItems.itemMisc;
|
||||
import static binnie.extratrees.item.ETMisc.Items.Bark;
|
||||
import static binnie.extratrees.item.ETMisc.Items.WoodWax;
|
||||
import static binnie.extratrees.item.ETMisc.Items.ProvenGear;
|
||||
import static binnie.extratrees.item.ETMisc.Items.GlassFitting;
|
||||
import static binnie.extratrees.item.ETMisc.Items.ProvenGear;
|
||||
import static binnie.extratrees.item.ETMisc.Items.WoodWax;
|
||||
|
||||
import binnie.Binnie;
|
||||
import binnie.core.BinnieCore;
|
||||
@@ -29,6 +30,10 @@ public class ModuleItems implements IInitializable {
|
||||
|
||||
@Override
|
||||
public void preInit() {
|
||||
// Loads ETItems.class, guaranteeing that items are init by this point
|
||||
// TODO: is this needed?
|
||||
itemMisc.getUnlocalizedName();
|
||||
|
||||
if (BinnieCore.isLepidopteryActive()) {
|
||||
ETItems.itemDictionaryLepi = new ItemMothDatabase();
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user