Anvilcraft/GregTech4
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed more items

Browse source
This commit is contained in:
TheDarkDnKTv 2020-08-05 19:33:40 +03:00
parent a509471172
commit 974c70cdd3
5 changed files with 57 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/gregtechmod/api/items/GT_Generic_Item.java
View file

@ -65,8 +65,5 @@ public class GT_Generic_Item extends Item {
addAdditionalToolTips(aList, aStack);
}
@SuppressWarnings("rawtypes")
public void addAdditionalToolTips(List aList, ItemStack aStack) {
}
public void addAdditionalToolTips(List<String> aList, ItemStack aStack) {}
}

22
src/main/java/gregtechmod/api/items/GT_Spray_Color_Item.java
View file

@ -6,21 +6,20 @@ import gregtechmod.api.util.GT_LanguageManager;
import gregtechmod.api.util.GT_ModHandler;
import gregtechmod.api.util.GT_OreDictUnificator;
import gregtechmod.api.util.GT_Utility;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
public class GT_Spray_Color_Item extends GT_Tool_Item {
public byte mColorMeta = 0;
public GT_Spray_Color_Item(int aID, String aName, int aMaxDamage, int aEntityDamage, byte aColorMeta) {
super(aID, aName, "To give the World more Color", aMaxDamage, aEntityDamage);
public GT_Spray_Color_Item(String aName, int aMaxDamage, int aEntityDamage, byte aColorMeta) {
super(aName, "To give the World more Color", aMaxDamage, aEntityDamage);
GT_OreDictUnificator.registerOre(Dyes.get(mColorMeta = aColorMeta), new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE));
setCraftingSound(GregTech_API.sSoundList.get(102));
setBreakingSound(GregTech_API.sSoundList.get(102));
@ -28,6 +27,7 @@ public class GT_Spray_Color_Item extends GT_Tool_Item {
setUsageAmounts(32, 3, 1);
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addAdditionalToolTips(List aList, ItemStack aStack) {
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_3", "Enough for dying " + getMaxDamage() + " Blocks in World " + Dyes.get(mColorMeta).mName.toLowerCase()));
@ -45,17 +45,15 @@ public class GT_Spray_Color_Item extends GT_Tool_Item {
if (aWorld.isRemote) {
return false;
}
Block aBlock = Block.blocksList[aWorld.getBlockId(aX, aY, aZ)];
Block aBlock = aWorld.getBlock(aX, aY, aZ);
if (aBlock == null) return false;
byte aMeta = (byte)aWorld.getBlockMetadata(aX, aY, aZ);
TileEntity aTileEntity = aWorld.getBlockTileEntity(aX, aY, aZ);
if (aBlock == Block.carpet || aBlock == Block.hardenedClay || aBlock == Block.stainedClay || GT_Utility.areStacksEqual(new ItemStack(aBlock, 1, GregTech_API.ITEM_WILDCARD_DAMAGE), GT_ModHandler.getTEItem("rockwool", 1))) {
if (aMeta == (~mColorMeta & 15) && aBlock != Block.hardenedClay) return false;
if (aBlock == Blocks.carpet || aBlock == Blocks.hardened_clay || aBlock == Blocks.stained_hardened_clay || GT_Utility.areStacksEqual(new ItemStack(aBlock, 1, GregTech_API.ITEM_WILDCARD_DAMAGE), GT_ModHandler.getTEItem("rockwool", 1))) {
if (aMeta == (~mColorMeta & 15) && aBlock != Blocks.hardened_clay) return false;
if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ);
if (aBlock == Block.hardenedClay)
aWorld.setBlock(aX, aY, aZ, Block.stainedClay.blockID, ~mColorMeta & 15, 3);
if (aBlock == Blocks.hardened_clay)
aWorld.setBlock(aX, aY, aZ, Blocks.stained_hardened_clay, ~mColorMeta & 15, 3);
else
aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ~mColorMeta & 15, 3);
}

95
src/main/java/gregtechmod/api/items/GT_Tool_Item.java
View file

@ -10,7 +10,7 @@ import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.enchantment.Enchantment;
import net.minecraft.entity.Entity;
@ -18,14 +18,14 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import com.google.common.collect.Multimap;
import cpw.mods.fml.relauncher.ReflectionHelper;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -34,7 +34,7 @@ import cpw.mods.fml.relauncher.SideOnly;
*/
public class GT_Tool_Item extends GT_Generic_Item {
public final List<String> mEffectiveAgainstList = new ArrayList<String>();
public final List<Integer> mEffectiveBlocksList = new ArrayList<Integer>();
public final List<Block> mEffectiveBlocksList = new ArrayList<Block>();
public final List<String> mEffectiveOreDictList = new ArrayList<String>();
public final List<Material> mEffectiveMaterialsList = new ArrayList<Material>();
@ -79,17 +79,12 @@ public class GT_Tool_Item extends GT_Generic_Item {
}
public final GT_Tool_Item addToBlockList(ItemStack aBlock) {
if (aBlock != null && aBlock.getItem() != null && aBlock.getItem() instanceof ItemBlock) mEffectiveBlocksList.add(((ItemBlock)aBlock.getItem()).getBlockID());
if (aBlock != null && aBlock.getItem() != null && aBlock.getItem() instanceof ItemBlock) mEffectiveBlocksList.add(Block.getBlockFromItem(aBlock.getItem()));
return this;
}
public final GT_Tool_Item addToBlockList(Block aBlock) {
if (aBlock != null) mEffectiveBlocksList.add(aBlock.blockID);
return this;
}
public final GT_Tool_Item addToBlockList(Integer aBlock) {
if (aBlock > 0) mEffectiveBlocksList.add(aBlock);
if (aBlock != null) mEffectiveBlocksList.add(aBlock);
return this;
}
@ -209,7 +204,7 @@ public class GT_Tool_Item extends GT_Generic_Item {
public void checkEnchantmentEffects(ItemStack aStack) {
if (aStack != null) {
if (aStack.isItemEnchanted()) aStack.stackTagCompound.getTags().remove(aStack.stackTagCompound.getTag("ench"));
aStack.stackTagCompound.removeTag("ench");
if (!GT_ModHandler.isElectricItem(aStack) || GT_ModHandler.canUseElectricItem(aStack, mEUperBrokenBlock)) {
if (mSilklevel > 0) aStack.addEnchantment(Enchantment.silkTouch , mSilklevel);
if (mFortunelevel > 0) aStack.addEnchantment(Enchantment.fortune , mFortunelevel);
@ -224,7 +219,7 @@ public class GT_Tool_Item extends GT_Generic_Item {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister aIconRegister) {
public void registerIcons(IIconRegister aIconRegister) {
super.registerIcons(aIconRegister);
if (mChargedGTID >= 0) ((GT_Generic_Item)GregTech_API.sItemList[mChargedGTID]) .mIcon = mIcon;
if (mDisChargedGTID >= 0) ((GT_Generic_Item)GregTech_API.sItemList[mDisChargedGTID]) .mIcon = mIcon;
@ -244,9 +239,10 @@ public class GT_Tool_Item extends GT_Generic_Item {
return false;
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(int var1, CreativeTabs var2, List aList) {
public void getSubItems(Item var1, CreativeTabs var2, List aList) {
if (GT_ModHandler.isElectricItem(new ItemStack(this, 1))) {
ItemStack tCharged = new ItemStack(this, 1);
GT_ModHandler.chargeElectricItem(tCharged, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false);
@ -257,7 +253,7 @@ public class GT_Tool_Item extends GT_Generic_Item {
}
@Override
public boolean shouldPassSneakingClickToBlock(World aWorld, int aX, int aY, int aZ) {
public boolean doesSneakBypassUse(World world, int x, int y, int z, EntityPlayer player) {
return true;
}
@ -277,7 +273,7 @@ public class GT_Tool_Item extends GT_Generic_Item {
}
@Override
public final ItemStack getContainerItemStack(ItemStack aStack) {
public final ItemStack getContainerItem(ItemStack aStack) {
checkEnchantmentEffects(aStack);
aStack = GT_Utility.copy(aStack);
if (aStack.getItemDamage() > aStack.getMaxDamage()) {
@ -316,48 +312,47 @@ public class GT_Tool_Item extends GT_Generic_Item {
return false;
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public Multimap getItemAttributeModifiers() {
Multimap multimap = super.getItemAttributeModifiers();
public Multimap getAttributeModifiers(ItemStack stack) {
Multimap multimap = super.getAttributeModifiers(stack);
multimap.put(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName(), new AttributeModifier(field_111210_e, "Weapon modifier", mEntityDamage>0?mEntityDamage:1, 0));
return multimap;
}
@Override
public final float getDamageVsEntity(Entity aAttackedEntity, ItemStack aStack) {
checkEnchantmentEffects(aStack);
int tDamage = mEntityDamage;
if (mEffectiveAgainstList.contains(GT_Utility.getClassName(aAttackedEntity))) tDamage *= 2;
if (tDamage > 1) {
if (GT_ModHandler.isElectricItem(aStack)) {
if (GT_ModHandler.canUseElectricItem(aStack, getDamagePerWeaponUse() * 1000)) {
return tDamage;
} else {
return 1;
}
} else {
return tDamage;
}
}
return 1;
}
// @Override // FIXME: dynamic damage
// public float getDamageVsEntity() { // To provide with entities, use Item#onLeftClickEntity
// checkEnchantmentEffects(aStack);
// int tDamage = mEntityDamage;
// if (mEffectiveAgainstList.contains(GT_Utility.getClassName(aAttackedEntity))) tDamage *= 2;
// if (tDamage > 1) {
// if (GT_ModHandler.isElectricItem(aStack)) {
// if (GT_ModHandler.canUseElectricItem(aStack, getDamagePerWeaponUse() * 1000)) {
// return tDamage;
// } else {
// return 1;
// }
// } else {
// return tDamage;
// }
// }
// return 1.0F;
// }
private final boolean isEffectiveAgainst(Block aBlock, int aMeta) {
if (mToolStrength > 1 && aBlock != null) {
Float tHarvestLevel = ReflectionHelper.getPrivateValue(Block.class, aBlock, new String[] {"blockHardness", "field_149782_v"});
if (getPrimaryToolClass() != null) {
int tHarvestLevel = MinecraftForge.getBlockHarvestLevel(aBlock, aMeta==-1?0:aMeta, getPrimaryToolClass());
if (tHarvestLevel >= 0) return tHarvestLevel <= mToolQuality;
}
if (getSecondaryToolClass() != null) {
int tHarvestLevel = MinecraftForge.getBlockHarvestLevel(aBlock, aMeta==-1?0:aMeta, getSecondaryToolClass());
if (tHarvestLevel >= 0) return tHarvestLevel <= mToolQuality;
}
if (getTertiaryToolClass() != null) {
int tHarvestLevel = MinecraftForge.getBlockHarvestLevel(aBlock, aMeta==-1?0:aMeta, getTertiaryToolClass());
if (tHarvestLevel >= 0) return tHarvestLevel <= mToolQuality;
}
if (mEffectiveMaterialsList.contains(aBlock.blockMaterial)) return true;
if (mEffectiveBlocksList.contains(aBlock.blockID)) return true;
if (mEffectiveMaterialsList.contains(aBlock.getMaterial())) return true;
if (mEffectiveBlocksList.contains(aBlock)) return true;
for (String tString : mEffectiveOreDictList) {
if (GT_OreDictUnificator.isItemStackInstanceOf(new ItemStack(aBlock, 1, aMeta==-1?GregTech_API.ITEM_WILDCARD_DAMAGE:aMeta), tString)) return true;
}
@ -379,26 +374,26 @@ public class GT_Tool_Item extends GT_Generic_Item {
@Override
public final boolean canHarvestBlock(Block aBlock, ItemStack aStack) {
return canHarvestBlock(aBlock) && (!GT_ModHandler.isElectricItem(aStack) || GT_ModHandler.canUseElectricItem(aStack, mEUperBrokenBlock));
return func_150897_b(aBlock) && (!GT_ModHandler.isElectricItem(aStack) || GT_ModHandler.canUseElectricItem(aStack, mEUperBrokenBlock));
}
@Override
public final boolean canHarvestBlock(Block aBlock) {
public final boolean func_150897_b(Block aBlock) {
return mToolStrength > 1 && isEffectiveAgainst(aBlock, -1);
}
@Override
public float getStrVsBlock(ItemStack aStack, Block aBlock, int aMeta) {
public float getDigSpeed(ItemStack aStack, Block aBlock, int aMeta) {
checkEnchantmentEffects(aStack);
if (mToolStrength <= 1 || !isEffectiveAgainst(aBlock, aMeta) || (GT_ModHandler.isElectricItem(aStack) && !GT_ModHandler.canUseElectricItem(aStack, mEUperBrokenBlock))) return 1.0F;
return mToolStrength;
}
@Override
public final boolean onBlockDestroyed(ItemStack aStack, World aWorld, int aID, int aX, int aY, int aZ, EntityLivingBase aPlayer) {
public final boolean onBlockDestroyed(ItemStack aStack, World aWorld, Block aBlock, int aX, int aY, int aZ, EntityLivingBase aPlayer) {
GT_Utility.sendSoundToPlayers(aWorld, mBlockBreakSound, mBlockBreakSoundStrength, -1, aX, aY, aZ);
checkEnchantmentEffects(aStack);
if (mToolStrength > 1 && (double)Block.blocksList[aID].getBlockHardness(aWorld, aX, aY, aZ) != 0.0D) {
if (mToolStrength > 1 && (double) aBlock.getBlockHardness(aWorld, aX, aY, aZ) != 0.0D) {
GT_ModHandler.damageOrDechargeItem(aStack, getDamagePerBlockBreak(), getDamagePerBlockBreak()*mEUperBrokenBlock, aPlayer);
checkEnchantmentEffects(aStack);
}
@ -414,14 +409,6 @@ public class GT_Tool_Item extends GT_Generic_Item {
return false;
}
public final int getChargedItemId(ItemStack aStack) {
return mChargedGTID<0?itemID:GregTech_API.getGregTechItem(mChargedGTID, 1, 0).itemID;
}
public final int getEmptyItemId(ItemStack aStack) {
return mDisChargedGTID<0?itemID:GregTech_API.getGregTechItem(mDisChargedGTID, 1, 0).itemID;
}
public final int getMaxCharge(ItemStack aStack) {
return getMaxDamage() * 1000;
}

4
src/main/java/gregtechmod/common/items/GT_Teslastaff_Item.java
View file

@ -5,9 +5,9 @@ import gregtechmod.api.util.GT_ModHandler;
import ic2.api.item.ElectricItem;
import ic2.api.item.IElectricItem;
import java.util.Collections;
import java.util.List;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
@ -23,7 +23,7 @@ public class GT_Teslastaff_Item extends ItemTool implements IElectricItem {
public int mCharge, mTransfer, mTier;
public GT_Teslastaff_Item(String aName) {
super(0, ToolMaterial.GOLD, new Block[0]);
super(0, ToolMaterial.GOLD, Collections.emptySet());
setCreativeTab(GregTech_API.TAB_GREGTECH);
setMaxStackSize(1);
setMaxDamage(100);

6
src/main/java/gregtechmod/loaders/load/GT_ItemLoader.java
View file

@ -520,7 +520,7 @@ public class GT_ItemLoader implements Runnable {
GregTech_API.sItemList[ 44] = GregTech_API.constructElectricArmorItem (GT_LanguageManager.mNameListItem[ 44], 10000, 32, 1, 0, 16|32, 0.0D, false, 0, tArmorID1);
GregTech_API.sItemList[ 45] = GregTech_API.constructElectricArmorItem (GT_LanguageManager.mNameListItem[ 45],100000000, 8192, 5, 0, 0, 0.0D, true, 1, tArmorID1);
GregTech_API.sItemList[ 46] = GregTech_API.constructElectricDrillItem (GT_LanguageManager.mNameListItem[ 46], 10, 0, 5, 3.0F, 1000, -1).setElectricTier(1).addToMaterialList(Material.anvil).addToMaterialList(Material.iron).addToMaterialList(Material.rock).setPrimaryToolClass("pickaxe").setSilkyness(3);
// try {GregTech_API.sItemList[ 47] = new GT_Teslastaff_Item (GT_LanguageManager.mNameListItem[ 47]); } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);}
try {GregTech_API.sItemList[ 47] = new GT_Teslastaff_Item (GT_LanguageManager.mNameListItem[ 47]); } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);}
GregTech_API.sItemList[ 48] = GregTech_API.constructRadioactiveCellItem (GT_LanguageManager.mNameListItem[ 48], 25000, 1, -5, null);
GregTech_API.sItemList[ 49] = GregTech_API.constructRadioactiveCellItem (GT_LanguageManager.mNameListItem[ 49], 25000, 2, -5, null);
GregTech_API.sItemList[ 50] = GregTech_API.constructRadioactiveCellItem (GT_LanguageManager.mNameListItem[ 50], 25000, 4, -5, null);
@ -538,7 +538,7 @@ public class GT_ItemLoader implements Runnable {
GregTech_API.sItemList[ 62] = GregTech_API.constructCoolantCellItem (GT_LanguageManager.mNameListItem[ 62], 360000, 6);
try {GregTech_API.sItemList[ 63] = new GT_Scanner_Item (GT_LanguageManager.mNameListItem[ 63]); } catch(Throwable e) {if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);}
GregTech_API.sItemList[ 64] = GregTech_API.constructCrowbarItem (GT_LanguageManager.mNameListItem[ 64], 256, 6);
// GregTech_API.sItemList[ 65] = new GT_Screwdriver_Item (GT_LanguageManager.mNameListItem[ 65], 256, 4, -1);
GregTech_API.sItemList[ 65] = new GT_Screwdriver_Item (GT_LanguageManager.mNameListItem[ 65], 256, 4, -1);
GregTech_API.sItemList[ 66] = GregTech_API.constructWrenchItem (GT_LanguageManager.mNameListItem[ 66], 1280, 8, -1);
GregTech_API.sItemList[ 67] = GregTech_API.constructWrenchItem (GT_LanguageManager.mNameListItem[ 67], 128, 4, -1);
GregTech_API.sItemList[ 68] = GregTech_API.constructWrenchItem (GT_LanguageManager.mNameListItem[ 68], 5120, 10, -1);
@ -574,7 +574,7 @@ public class GT_ItemLoader implements Runnable {
// GregTech_API.sItemList[ 98] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 98], GT_LanguageManager.mNameListItem[ 98], 2048, 0, (byte) 2);
// GregTech_API.sItemList[ 99] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 99], GT_LanguageManager.mNameListItem[ 99], 2048, 0, (byte) 3);
// GregTech_API.sItemList[100] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[100], GT_LanguageManager.mNameListItem[100], 2048, 0, (byte) 4);
// GregTech_API.sItemList[101] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[101], GT_LanguageManager.mNameListItem[101], 2048, 0, (byte) 5);
GregTech_API.sItemList[101] = new GT_Spray_Color_Item (GT_LanguageManager.mNameListItem[101], 2048, 0, (byte) 5);
// GregTech_API.sItemList[102] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[102], GT_LanguageManager.mNameListItem[102], 2048, 0, (byte) 6);
// GregTech_API.sItemList[103] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[103], GT_LanguageManager.mNameListItem[103], 2048, 0, (byte) 7);
// GregTech_API.sItemList[104] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[104], GT_LanguageManager.mNameListItem[104], 2048, 0, (byte) 8);