Fix rest of items

This commit is contained in:
sferatime 2020-08-05 18:26:37 +03:00
parent a509471172
commit 8969fc097c
7 changed files with 57 additions and 54 deletions

View file

@ -11,16 +11,17 @@ 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,8 +29,9 @@ public class GT_Spray_Color_Item extends GT_Tool_Item {
setUsageAmounts(32, 3, 1);
}
@SuppressWarnings("unchecked")
@Override
public void addAdditionalToolTips(List aList, ItemStack aStack) {
public void addAdditionalToolTips(@SuppressWarnings("rawtypes") List aList, ItemStack aStack) {
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_3", "Enough for dying " + getMaxDamage() + " Blocks in World " + Dyes.get(mColorMeta).mName.toLowerCase()));
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Enough for crafting " + (getMaxDamage()/getDamagePerContainerItemCraft()) + " times"));
}
@ -45,17 +47,17 @@ 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);
TileEntity aTileEntity = aWorld.getTileEntity(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);
}

View file

@ -16,11 +16,11 @@ import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.util.ForgeDirection;
public class GT_Spray_Foam_Item extends GT_Tool_Item {
public GT_Spray_Foam_Item(int aID, String aName, int aMaxDamage, int aEntityDamage) {
super(aID, aName, "Precision Spray", aMaxDamage, aEntityDamage);
public GT_Spray_Foam_Item(String aName, int aMaxDamage, int aEntityDamage) {
super(aName, "Precision Spray", aMaxDamage, aEntityDamage);
setCraftingSound(GregTech_API.sSoundList.get(102));
setBreakingSound(GregTech_API.sSoundList.get(102));
setEntityHitSound(GregTech_API.sSoundList.get(102));
@ -41,8 +41,9 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item {
}
}
@SuppressWarnings("unchecked")
@Override
public void addAdditionalToolTips(List aList, ItemStack aStack) {
public void addAdditionalToolTips(@SuppressWarnings("rawtypes") List aList, ItemStack aStack) {
super.addAdditionalToolTips(aList, aStack);
switch (getMode(aStack)) {
case 0: aList.add("Single Block Mode"); break;
@ -64,10 +65,10 @@ public class GT_Spray_Foam_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);
TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
try {
if (GT_Utility.getClassName(aTileEntity).startsWith("TileEntityCable")) {
@ -81,7 +82,7 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item {
return false;
}
} catch(Throwable e) {
if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);
if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);;
}
if (aTileEntity instanceof BaseMetaPipeEntity && (((BaseMetaPipeEntity)aTileEntity).mConnections & -64) == 0) {
@ -114,17 +115,17 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item {
}
switch (getMode(aStack)) {
case 0:
if (GT_Utility.isAirBlock(aWorld, aX, aY, aZ) && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
if (aWorld.isAirBlock(aX, aY, aZ) && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ);
aWorld.setBlock(aX, aY, aZ, ((ItemBlock)tStack.getItem()).getBlockID(), tStack.getItemDamage(), 3);
aWorld.setBlock(aX, aY, aZ, Block.getBlockFromItem(tStack.getItem()), tStack.getItemDamage(), 3);
return true;
}
break;
case 1:
for (byte i = 0; i < 4; i++) {
if (GT_Utility.isAirBlock(aWorld, aX, aY, aZ) && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
if (aWorld.isAirBlock(aX, aY, aZ) && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ);
aWorld.setBlock(aX, aY, aZ, ((ItemBlock)tStack.getItem()).getBlockID(), tStack.getItemDamage(), 3);
aWorld.setBlock(aX, aY, aZ, Block.getBlockFromItem(tStack.getItem()), tStack.getItemDamage(), 3);
} else {
if (i == 0) return false; else break;
}
@ -144,10 +145,10 @@ public class GT_Spray_Foam_Item extends GT_Tool_Item {
aZ -= (tZFactor ? 1 : 0);
for (byte i = 0; i < 3; i++) for (byte j = 0; j < 3; j++) {
if (GT_Utility.isAirBlock(aWorld, aX + (tXFactor?i:0), aY + (!tXFactor&&tYFactor?i:0) + (!tZFactor&&tYFactor?j:0), aZ + (tZFactor?j:0))) {
if (aWorld.isAirBlock(aX + (tXFactor?i:0), aY + (!tXFactor&&tYFactor?i:0) + (!tZFactor&&tYFactor?j:0), aZ + (tZFactor?j:0))) {
if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ);
aWorld.setBlock(aX + (tXFactor?i:0), aY + (!tXFactor&&tYFactor?i:0) + (!tZFactor&&tYFactor?j:0), aZ + (tZFactor?j:0), ((ItemBlock)tStack.getItem()).getBlockID(), tStack.getItemDamage(), 3);
aWorld.setBlock(aX + (tXFactor?i:0), aY + (!tXFactor&&tYFactor?i:0) + (!tZFactor&&tYFactor?j:0), aZ + (tZFactor?j:0), Block.getBlockFromItem(tStack.getItem()), tStack.getItemDamage(), 3);
temp = true;
} else {
break;

View file

@ -14,8 +14,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class GT_Spray_Hardener_Item extends GT_Tool_Item {
public GT_Spray_Hardener_Item(int aID, String aName, int aMaxDamage, int aEntityDamage) {
super(aID, aName, "Construction Foam Hardener", aMaxDamage, aEntityDamage);
public GT_Spray_Hardener_Item(String aName, int aMaxDamage, int aEntityDamage) {
super(aName, "Construction Foam Hardener", aMaxDamage, aEntityDamage);
setCraftingSound(GregTech_API.sSoundList.get(102));
setBreakingSound(GregTech_API.sSoundList.get(102));
setEntityHitSound(GregTech_API.sSoundList.get(102));
@ -33,10 +33,10 @@ public class GT_Spray_Hardener_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);
TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
try {
if (GT_Utility.getClassName(aTileEntity).startsWith("TileEntityCable")) {
@ -50,14 +50,14 @@ public class GT_Spray_Hardener_Item extends GT_Tool_Item {
return false;
}
} catch(Throwable e) {
if (GregTech_API.DEBUG_MODE) e.printStackTrace(GT_Log.err);
if (GregTech_API.DEBUG_MODE) GT_Log.log.catching(e);;
}
ItemStack tStack1 = GT_ModHandler.getIC2Item("constructionFoam", 1), tStack2 = GT_ModHandler.getIC2Item("constructionFoamWall", 1);
if (tStack1 != null && tStack1.isItemEqual(new ItemStack(aBlock)) && tStack2 != null && tStack2.getItem() != null && tStack2.getItem() instanceof ItemBlock) {
if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ);
aWorld.setBlock(aX, aY, aZ, ((ItemBlock)tStack2.getItem()).getBlockID(), 7, 3);
aWorld.setBlock(aX, aY, aZ, Block.getBlockFromItem(tStack2.getItem()), 7, 3);
}
return true;
}

View file

@ -11,8 +11,8 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class GT_Spray_Hydration_Item extends GT_Tool_Item {
public GT_Spray_Hydration_Item(int aID, String aName, int aMaxDamage, int aEntityDamage) {
super(aID, aName, "To hydrate Crops and similar", aMaxDamage, aEntityDamage);
public GT_Spray_Hydration_Item(String aName, int aMaxDamage, int aEntityDamage) {
super(aName, "To hydrate Crops and similar", aMaxDamage, aEntityDamage);
setCraftingSound(GregTech_API.sSoundList.get(102));
setBreakingSound(GregTech_API.sSoundList.get(102));
setEntityHitSound(GregTech_API.sSoundList.get(102));
@ -30,10 +30,10 @@ public class GT_Spray_Hydration_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);
TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
try {
if (aTileEntity instanceof ic2.api.crops.ICropTile) {

View file

@ -11,13 +11,12 @@ import net.minecraft.entity.monster.EntitySlime;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
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_Ice_Item extends GT_Tool_Item {
public GT_Spray_Ice_Item( String aName, int aMaxDamage, int aEntityDamage) {
@ -59,7 +58,7 @@ public class GT_Spray_Ice_Item extends GT_Tool_Item {
aX += ForgeDirection.getOrientation(aSide).offsetX;
aY += ForgeDirection.getOrientation(aSide).offsetY;
aZ += ForgeDirection.getOrientation(aSide).offsetZ;
Block aBlock = aWorld.getBlock(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.getTileEntity(aX, aY, aZ);
@ -67,7 +66,7 @@ public class GT_Spray_Ice_Item extends GT_Tool_Item {
if (aBlock == Blocks.water || aBlock == Blocks.flowing_water) {
if (aMeta == 0 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(102), 1.0F, -1, aX, aY, aZ);
aWorld.setBlock(aX, aY, aZ, Block.ice.blockID, 0, 3);
aWorld.setBlock(aX, aY, aZ, Blocks.ice, 0, 3);
return true;
}
return false;

View file

@ -17,16 +17,17 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
public class GT_Spray_Pepper_Item extends GT_Tool_Item {
public GT_Spray_Pepper_Item(int aID, String aName, int aMaxDamage, int aEntityDamage) {
super(aID, aName, "To defend yourself against Bears", aMaxDamage, aEntityDamage);
public GT_Spray_Pepper_Item(String aName, int aMaxDamage, int aEntityDamage) {
super(aName, "To defend yourself against Bears", aMaxDamage, aEntityDamage);
setCraftingSound(GregTech_API.sSoundList.get(102));
setBreakingSound(GregTech_API.sSoundList.get(102));
setEntityHitSound(GregTech_API.sSoundList.get(102));
setUsageAmounts(1, 8, 1);
}
@SuppressWarnings("unchecked")
@Override
public void addAdditionalToolTips(List aList, ItemStack aStack) {
public void addAdditionalToolTips(@SuppressWarnings("rawtypes") List aList, ItemStack aStack) {
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "especially Pedobears, Care Bears,"));
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Confession Bears and Bear Grylls"));
}
@ -52,10 +53,10 @@ public class GT_Spray_Pepper_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);
TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
return false;
}

View file

@ -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);
@ -564,17 +564,17 @@ public class GT_ItemLoader implements Runnable {
GregTech_API.sItemList[ 88] = new GT_File_Item (GT_LanguageManager.mNameListItem[ 88], 1280, 3);
GregTech_API.sItemList[ 89] = new GT_File_Item (GT_LanguageManager.mNameListItem[ 89], 5120, 4);
GregTech_API.sItemList[ 90] = new GT_Spray_Bug_Item (GT_LanguageManager.mNameListItem[ 90], 128, 2);
// GregTech_API.sItemList[ 91] = new GT_Spray_Ice_Item (GT_Mod.sItemIDs[ 91], GT_LanguageManager.mNameListItem[ 91], 512, 4);
// GregTech_API.sItemList[ 92] = new GT_Spray_Hardener_Item (GT_Mod.sItemIDs[ 92], GT_LanguageManager.mNameListItem[ 92], 256, 0);
// GregTech_API.sItemList[ 93] = new GT_Spray_Foam_Item (GT_Mod.sItemIDs[ 93], GT_LanguageManager.mNameListItem[ 93], 400, 0);
// GregTech_API.sItemList[ 94] = new GT_Spray_Pepper_Item (GT_Mod.sItemIDs[ 94], GT_LanguageManager.mNameListItem[ 94], 128, 2);
// GregTech_API.sItemList[ 95] = new GT_Spray_Hydration_Item (GT_Mod.sItemIDs[ 95], GT_LanguageManager.mNameListItem[ 95], 2560, 0);
// GregTech_API.sItemList[ 96] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 96], GT_LanguageManager.mNameListItem[ 96], 2048, 0, (byte) 0);
// GregTech_API.sItemList[ 97] = new GT_Spray_Color_Item (GT_Mod.sItemIDs[ 97], GT_LanguageManager.mNameListItem[ 97], 2048, 0, (byte) 1);
// 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[ 91] = new GT_Spray_Ice_Item (GT_LanguageManager.mNameListItem[ 91], 512, 4);
GregTech_API.sItemList[ 92] = new GT_Spray_Hardener_Item (GT_LanguageManager.mNameListItem[ 92], 256, 0);
GregTech_API.sItemList[ 93] = new GT_Spray_Foam_Item (GT_LanguageManager.mNameListItem[ 93], 400, 0);
GregTech_API.sItemList[ 94] = new GT_Spray_Pepper_Item (GT_LanguageManager.mNameListItem[ 94], 128, 2);
GregTech_API.sItemList[ 95] = new GT_Spray_Hydration_Item (GT_LanguageManager.mNameListItem[ 95], 2560, 0);
GregTech_API.sItemList[ 96] = new GT_Spray_Color_Item (GT_LanguageManager.mNameListItem[ 96], 2048, 0, (byte) 0);
GregTech_API.sItemList[ 97] = new GT_Spray_Color_Item (GT_LanguageManager.mNameListItem[ 97], 2048, 0, (byte) 1);
GregTech_API.sItemList[ 98] = new GT_Spray_Color_Item (GT_LanguageManager.mNameListItem[ 98], 2048, 0, (byte) 2);
GregTech_API.sItemList[ 99] = new GT_Spray_Color_Item (GT_LanguageManager.mNameListItem[ 99], 2048, 0, (byte) 3);
GregTech_API.sItemList[100] = new GT_Spray_Color_Item (GT_LanguageManager.mNameListItem[100], 2048, 0, (byte) 4);
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);