diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/item')
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/ModItems.java | 30 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustSpecialUse.java | 120 |
2 files changed, 142 insertions, 8 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java index 6af9d23600..dd913afd6d 100644 --- a/src/Java/gtPlusPlus/core/item/ModItems.java +++ b/src/Java/gtPlusPlus/core/item/ModItems.java @@ -110,9 +110,7 @@ public final class ModItems { public static MultiPickaxeBase MP_Diamond; public static MultiPickaxeBase MP_Wood; public static MultiPickaxeBase MP_Stone; - public static MultiPickaxeBase MP_Quartz; - public static MultiPickaxeBase MP_Obsidian; - public static MultiPickaxeBase MP_Redstone; + public static MultiPickaxeBase MP_GTMATERIAL; public static BaseItemBackpack backpack_Red; public static BaseItemBackpack backpack_Green; @@ -239,11 +237,27 @@ public final class ModItems { MP_Gold = new MultiPickaxeBase("Gold Multipick", ToolMaterial.GOLD, ToolMaterial.GOLD.getMaxUses(), Utils.rgbtoHexValue(238,221,130)); MP_Diamond = new MultiPickaxeBase("Diamond Multipick", ToolMaterial.EMERALD, ToolMaterial.EMERALD.getMaxUses(), Utils.rgbtoHexValue(191,239,255)); - MP_Redstone = UtilsItems.generateMultiPick(Materials.Redstone); - MP_Obsidian = UtilsItems.generateMultiPick(Materials.Obsidian); - MP_Obsidian = UtilsItems.generateMultiPick(Materials.Abyssal); - MP_Obsidian = UtilsItems.generateMultiPick(Materials.NetherStar); - MP_Obsidian = UtilsItems.generateMultiPick(Materials.Neutronium); + + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Tin); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Copper); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Bronze); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Steel); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Lead); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Silver); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Titanium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Tungsten); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Platinum); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Chrome); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.TungstenSteel); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Aluminium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Thaumium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Cobalt); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Iridium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Ultimet); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Osmiridium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.NetherStar); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Europium); + MP_GTMATERIAL = UtilsItems.generateMultiPick(Materials.Neutronium); //EnderIO Resources if (LoadedMods.EnderIO || LOAD_ALL_CONTENT){ diff --git a/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustSpecialUse.java b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustSpecialUse.java new file mode 100644 index 0000000000..46f6066a22 --- /dev/null +++ b/src/Java/gtPlusPlus/core/item/base/dusts/BaseItemDustSpecialUse.java @@ -0,0 +1,120 @@ +package gtPlusPlus.core.item.base.dusts; + +import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc; +import gregtech.api.util.GT_OreDictUnificator; +import gtPlusPlus.core.lib.CORE; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.item.UtilsItems; +import gtPlusPlus.core.util.math.MathUtils; + +import java.util.List; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.world.World; +import cpw.mods.fml.common.registry.GameRegistry; + +public class BaseItemDustSpecialUse extends Item{ + + protected int colour; + protected String materialName; + protected String pileType; + String name = ""; + + public BaseItemDustSpecialUse(String unlocalizedName, String materialName, int colour, String pileSize) { + setUnlocalizedName(unlocalizedName); + this.setUnlocalizedName(unlocalizedName); + this.setMaxStackSize(64); + if (pileSize == "dust" || pileSize == "Dust"){ + this.setTextureName(CORE.MODID + ":" + "dust");} + else{ + this.setTextureName(CORE.MODID + ":" + "dust"+pileSize);} + this.setCreativeTab(tabMisc); + this.colour = colour; + this.materialName = materialName; + this.sRadiation = UtilsItems.getRadioactivityLevel(materialName); + GameRegistry.registerItem(this, unlocalizedName); + + String temp = ""; + Utils.LOG_WARNING("Unlocalized name for OreDict nameGen: "+getUnlocalizedName()); + if (getUnlocalizedName().contains("item.")){ + temp = getUnlocalizedName().replace("item.", ""); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); + } + else { + temp = getUnlocalizedName(); + } + if (temp.contains("DustTiny")){ + temp = temp.replace("itemD", "d"); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); + } + else if (temp.contains("DustSmall")){ + temp = temp.replace("itemD", "d"); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); + } + else { + temp = temp.replace("itemD", "d"); + Utils.LOG_WARNING("Generating OreDict Name: "+temp); + } + if (temp != null && temp != ""){ + GT_OreDictUnificator.registerOre(temp, UtilsItems.getSimpleStack(this)); + } + } + + @Override + public String getItemStackDisplayName(ItemStack iStack) { + + if (getUnlocalizedName().contains("DustTiny")){ + name = "Tiny Pile of "+materialName + " Dust"; + } + else if (getUnlocalizedName().contains("DustSmall")){ + name = "Small Pile of "+materialName + " Dust"; + } + else { + name = materialName + " Dust"; + } + return name; + } + + protected final int sRadiation; + @Override + public void onUpdate(ItemStack iStack, World world, Entity entityHolding, int p_77663_4_, boolean p_77663_5_) { + Utils.applyRadiationDamageToEntity(sRadiation, world, entityHolding); + } + + @Override + public void addInformation(ItemStack stack, EntityPlayer aPlayer, List list, boolean bool) { + //if (pileType != null && materialName != null && pileType != "" && materialName != "" && !pileType.equals("") && !materialName.equals("")){ + if (getUnlocalizedName().contains("DustTiny")){ + list.add(EnumChatFormatting.GRAY+"A tiny pile of " + materialName + " dust."); + } + else if (getUnlocalizedName().contains("DustSmall")){ + list.add(EnumChatFormatting.GRAY+"A small pile of " + materialName + " dust."); + } + else { + list.add(EnumChatFormatting.GRAY+"A pile of " + materialName + " dust."); + } + if (sRadiation > 0){ + list.add(CORE.GT_Tooltip_Radioactive); + } + //} + super.addInformation(stack, aPlayer, list, bool); + } + + public final String getMaterialName() { + return materialName; + } + + @Override + public int getColorFromItemStack(ItemStack stack, int HEX_OxFFFFFF) { + if (colour == 0){ + return MathUtils.generateSingularRandomHexValue(); + } + return colour; + + } + +} |