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

Merge branch 'master' of https://github.com/Nukepowered/GregTech4

Browse source 
# Conflicts:
#	src/main/java/gregtechmod/api/items/GT_CrowbarRC_Item.java
This commit is contained in:
sferatime 2020-08-06 00:06:59 +03:00
commit 2090c99651
38 changed files with 169 additions and 179 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build.gradle
View file

@ -65,6 +65,7 @@ dependencies {
compile files("libs/ThermalExpansion-[1.7.10]4.1.5-248-dev.jar")
compile files("libs/ThermalFoundation-[1.7.10]1.2.6-118-dev.jar")
compile files("libs/Railcraft_1.7.10-9.12.2.1-dev.jar")
compile files("libs/MineFactoryReloaded-[1.7.10]2.8.1-174-dev.jar")
}
processResources

BIN
libs/MineFactoryReloaded-[1.7.10]2.8.1-174-dev.jar Normal file
View file

Binary file not shown.

BIN
libs/src/MineFactoryReloaded-[1.7.10]2.8.1-174-src.jar Normal file
View file

Binary file not shown.

9
src/main/java/gregtechmod/api/GregTech_API.java
View file

@ -27,6 +27,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.resources.I18n;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -330,7 +331,7 @@ public class GregTech_API {
try {
return (Item)Class.forName("gregtechmod.api.items.GT_CoolantCell_Item").getConstructors()[0].newInstance(aName, aMaxStore, aCellCount);
} catch(Throwable e) {}
return new gregtechmod.api.items.GT_Generic_Item(aName, "Doesn't work as intended, this is a Bug", false);
return new gregtechmod.api.items.GT_Generic_Item(aName, I18n.format("item.bug.tooltip"));
}
/**
@ -347,7 +348,7 @@ public class GregTech_API {
try {
return (Item)Class.forName("gregtechmod.api.items.GT_RadioactiveCell_Item").getConstructors()[0].newInstance(aName, aMaxDelay, aCellcount, aPulseRate, aDepleted);
} catch(Throwable e) {}
return new gregtechmod.api.items.GT_Generic_Item(aName, "Doesn't work as intended, this is a Bug", false);
return new gregtechmod.api.items.GT_Generic_Item(aName, I18n.format("item.bug.tooltip"));
}
/**
@ -360,7 +361,7 @@ public class GregTech_API {
try {
return (Item)Class.forName("gregtechmod.api.items.GT_EnergyArmor_Item").getConstructors()[0].newInstance(aName, aCharge, aTransfer, aTier, aDamageEnergyCost, aSpecials, aArmorAbsorbtionPercentage, aChargeProvider, aType, aArmorIndex);
} catch(Throwable e) {}
return new gregtechmod.api.items.GT_Generic_Item(aName, "Doesn't work as intended, this is a Bug", false);
return new gregtechmod.api.items.GT_Generic_Item(aName, I18n.format("item.bug.tooltip"));
}
/**
@ -373,7 +374,7 @@ public class GregTech_API {
try {
return (Item)Class.forName("gregtechmod.api.items.GT_EnergyStore_Item").getConstructors()[0].newInstance(aName, aCharge, aTransfer, aTier, aEmptyID, aFullID);
} catch(Throwable e) {}
return new gregtechmod.api.items.GT_Generic_Item(aName, "Doesn't work as intended, this is a Bug", false);
return new gregtechmod.api.items.GT_Generic_Item(aName, I18n.format("item.bug.tooltip"));
}
/**

8
src/main/java/gregtechmod/api/items/GT_CoolantCellIC_Item.java
View file

@ -5,17 +5,17 @@ import ic2.api.reactor.IReactorComponent;
import net.minecraft.item.ItemStack;
public class GT_CoolantCellIC_Item extends GT_CoolantCell_Item implements IReactorComponent {
public GT_CoolantCellIC_Item(int aID, String aName, int aMaxStore, int aCellCount) {
super(aID, aName, aMaxStore, aCellCount);
public GT_CoolantCellIC_Item(String aName, int aMaxStore, int aCellCount) {
super(aName, aMaxStore, aCellCount);
}
@Override
public void processChamber(IReactor aReactor, ItemStack aStack, int x, int y) {
public void processChamber(IReactor aReactor, ItemStack aStack, int x, int y, boolean heatrun) {
return;
}
@Override
public boolean acceptUraniumPulse(IReactor aReactor, ItemStack aStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY) {
public boolean acceptUraniumPulse(IReactor aReactor, ItemStack aStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY, boolean heatrun) {
return false;
}

6
src/main/java/gregtechmod/api/items/GT_CoolantCell_Item.java
View file

@ -11,8 +11,8 @@ import net.minecraft.nbt.NBTTagCompound;
public class GT_CoolantCell_Item extends GT_Generic_Item implements ICapsuleCellContainer {
protected int heatStorage, mCellCount;
public GT_CoolantCell_Item(int aID, String aName, int aMaxStore, int aCellCount) {
super(aID, aName, null);
public GT_CoolantCell_Item(String aName, int aMaxStore, int aCellCount) {
super(aName, null);
setMaxStackSize(1);
setMaxDamage(100);
setNoRepair();
@ -44,7 +44,7 @@ public class GT_CoolantCell_Item extends GT_Generic_Item implements ICapsuleCell
@Override
public void addAdditionalToolTips(List aList, ItemStack aStack) {
super.addAdditionalToolTips(aList, aStack);
aList.add("Stored Heat: " + getHeatOfStack(aStack));
aList.add("Stored Heat: " + getHeatOfStack(aStack)); // FIXME: lang
}
protected int getHeatOfStack(ItemStack aStack) {

28
src/main/java/gregtechmod/api/items/GT_Crowbar_Item.java
View file

@ -11,19 +11,19 @@ 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;
public class GT_Crowbar_Item extends GT_Tool_Item {
public GT_Crowbar_Item(int aID, String aName, int aMaxDamage, int aEntityDamage) {
super(aID, aName, "To remove Covers from Machines", aMaxDamage, aEntityDamage, -1, -1, 5, 20.0F);
public GT_Crowbar_Item(String aName, int aMaxDamage, int aEntityDamage) {
super(aName, "To remove Covers from Machines", aMaxDamage, aEntityDamage, -1, -1, 5, 20.0F); // FIXME lang
GregTech_API.registerCrowbar(new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE));
GT_OreDictUnificator.registerOre(GT_ToolDictNames.craftingToolCrowbar, new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE));
addToBlockList(Block.rail);
addToBlockList(Block.railPowered);
addToBlockList(Block.railDetector);
addToBlockList(Block.railActivator);
addToBlockList(Blocks.rail);
addToBlockList(Blocks.golden_rail);
addToBlockList(Blocks.detector_rail);
addToBlockList(Blocks.activator_rail);
addToBlockList(GT_ModHandler.getRCItem("track.boarding", 1));
addToBlockList(GT_ModHandler.getRCItem("track.elevator", 1));
setUsageAmounts(1, 2, 1);
@ -33,10 +33,11 @@ public class GT_Crowbar_Item extends GT_Tool_Item {
return false;
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addAdditionalToolTips(List aList, ItemStack aStack) {
super.addAdditionalToolTips(aList, aStack);
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Can turn Rails"));
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Can turn Rails")); // FIXME: lang
}
@Override
@ -46,24 +47,23 @@ public class GT_Crowbar_Item extends GT_Tool_Item {
return false;
}
if (isRCCrowbar()) 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.rail) {
if (aBlock == Blocks.rail) {
if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
aWorld.isRemote = true;
aWorld.setBlock(aX, aY, aZ, aBlock.blockID, (aMeta + 1) % 10, 0);
aWorld.setBlock(aX, aY, aZ, aBlock, (aMeta + 1) % 10, 0);
aWorld.isRemote = false;
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(0), 1.0F, -1, aX, aY, aZ);
}
return true;
}
if (aBlock == Block.railPowered || aBlock == Block.railActivator || aBlock == Block.railDetector) {
if (aBlock == Blocks.golden_rail || aBlock == Blocks.activator_rail || aBlock == Blocks.detector_rail) {
if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
aWorld.isRemote = true;
aWorld.setBlock(aX, aY, aZ, aBlock.blockID, ((aMeta / 8) * 8) + (((aMeta%8)+1) % 6), 0);
aWorld.setBlock(aX, aY, aZ, aBlock, ((aMeta / 8) * 8) + (((aMeta%8)+1) % 6), 0);
aWorld.isRemote = false;
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(0), 1.0F, -1, aX, aY, aZ);
}

4
src/main/java/gregtechmod/api/items/GT_DrillIC_Item.java
View file

@ -3,7 +3,7 @@ package gregtechmod.api.items;
import ic2.api.item.IElectricItem;
public class GT_DrillIC_Item extends GT_Drill_Item implements IElectricItem {
public GT_DrillIC_Item(int aID, String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) {
super(aID, aName, aMaxDamage, aEntityDamage, aToolQuality, aToolStrength, aEnergyConsumptionPerBlockBreak, aDisChargedGTID);
public GT_DrillIC_Item(String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) {
super(aName, aMaxDamage, aEntityDamage, aToolQuality, aToolStrength, aEnergyConsumptionPerBlockBreak, aDisChargedGTID);
}
}

9
src/main/java/gregtechmod/api/items/GT_Drill_Item.java
View file

@ -1,14 +1,13 @@
package gregtechmod.api.items;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
public class GT_Drill_Item extends GT_Tool_Item {
public GT_Drill_Item(int aID, String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) {
super(aID, aName, "For quickly making Holes", aMaxDamage, aEntityDamage, -1, aDisChargedGTID, aToolQuality, aToolStrength);
public GT_Drill_Item(String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) {
super(aName, "For quickly making Holes", aMaxDamage, aEntityDamage, -1, aDisChargedGTID, aToolQuality, aToolStrength); // FIXME lang
setElectricConsumptionPerBrokenBlock(aEnergyConsumptionPerBlockBreak);
addToBlockList(Block.silverfish);
addToBlockList(Block.tnt);
addToBlockList(Blocks.tnt);
}
@Override

4
src/main/java/gregtechmod/api/items/GT_EmptyToolIC_Item.java
View file

@ -3,7 +3,7 @@ package gregtechmod.api.items;
import ic2.api.item.IElectricItem;
public class GT_EmptyToolIC_Item extends GT_EmptyTool_Item implements IElectricItem {
public GT_EmptyToolIC_Item(int aID, String aName, int aMaxDamage, int aChargedGTID) {
super(aID, aName, aMaxDamage, aChargedGTID);
public GT_EmptyToolIC_Item(String aName, int aMaxDamage, int aChargedGTID) {
super(aName, aMaxDamage, aChargedGTID);
}
}

12
src/main/java/gregtechmod/api/items/GT_EmptyTool_Item.java
View file

@ -1,15 +1,17 @@
package gregtechmod.api.items;
import net.minecraft.client.renderer.texture.IconRegister;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
public class GT_EmptyTool_Item extends GT_Tool_Item {
public GT_EmptyTool_Item(int aID, String aName, int aMaxDamage, int aChargedGTID) {
super(aID, aName, "Empty. You need to recharge it.", aMaxDamage, 0, aChargedGTID, -1);
public GT_EmptyTool_Item(String aName, int aMaxDamage, int aChargedGTID) {
super(aName, "Empty. You need to recharge it.", aMaxDamage, 0, aChargedGTID, -1); // FIXME lang
try {
Class.forName("codechicken.nei.api.API");
codechicken.nei.api.API.hideItem(itemID);
codechicken.nei.api.API.hideItem(new ItemStack(this, 1, OreDictionary.WILDCARD_VALUE));
} catch(Throwable e) {}
}
@ -20,7 +22,7 @@ public class GT_EmptyTool_Item extends GT_Tool_Item {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister aIconRegister) {
public void registerIcons(IIconRegister aIconRegister) {
}
}

4
src/main/java/gregtechmod/api/items/GT_EnergyArmorIC_Item.java
View file

@ -4,7 +4,7 @@ import ic2.api.item.IElectricItem;
import ic2.api.item.IMetalArmor;
public class GT_EnergyArmorIC_Item extends GT_EnergyArmor_Item implements IMetalArmor, IElectricItem {
public GT_EnergyArmorIC_Item(int aID, String aName, int aCharge, int aTransfer, int aTier, int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, int aType, int aArmorIndex) {
super(aID, aName, aCharge, aTransfer, aTier, aDamageEnergyCost, aSpecials, aArmorAbsorbtionPercentage, aChargeProvider, aType, aArmorIndex);
public GT_EnergyArmorIC_Item(String aName, int aCharge, int aTransfer, int aTier, int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, int aType, int aArmorIndex) {
super(aName, aCharge, aTransfer, aTier, aDamageEnergyCost, aSpecials, aArmorAbsorbtionPercentage, aChargeProvider, aType, aArmorIndex);
}
}

58
src/main/java/gregtechmod/api/items/GT_EnergyArmor_Item.java
View file

@ -8,11 +8,13 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.resources.I18n;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumArmorMaterial;
import net.minecraft.init.Blocks;
import net.minecraft.item.Item;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -23,8 +25,8 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraftforge.common.ISpecialArmor;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.living.LivingFallEvent;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -33,10 +35,10 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
public boolean mChargeProvider;
public double mArmorAbsorbtionPercentage;
public static Map jumpChargeMap = new HashMap();
public static Map<EntityPlayer, Float> jumpChargeMap = new HashMap<>();
public GT_EnergyArmor_Item(int aID, String aName, int aCharge, int aTransfer, int aTier, int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, int aType, int aArmorIndex) {
super(aID, EnumArmorMaterial.DIAMOND, aArmorIndex, aType);
public GT_EnergyArmor_Item(String aName, int aCharge, int aTransfer, int aTier, int aDamageEnergyCost, int aSpecials, double aArmorAbsorbtionPercentage, boolean aChargeProvider, int aType, int aArmorIndex) {
super(ArmorMaterial.DIAMOND, aArmorIndex, aType);
setMaxStackSize(1);
setMaxDamage(100);
setNoRepair();
@ -71,13 +73,14 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
@Override
@SideOnly(Side.CLIENT)
public void registerIcons(IconRegister aIconRegister) {
public void registerIcons(IIconRegister aIconRegister) {
this.itemIcon = aIconRegister.registerIcon(GregTech_API.TEXTURE_PATH_ITEM + getUnlocalizedName());
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
aList.add("Tier: " + mTier);
aList.add(I18n.format("item.electric.tier.tooltip", mTier)); // FIXME: lang
if ((mSpecials & 1) != 0) aList.add("Rebreather");
if ((mSpecials & 2) != 0) aList.add("Inertia Damper");
if ((mSpecials & 4) != 0) aList.add("Food Replicator");
@ -99,7 +102,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
}
@Override
public void onArmorTickUpdate(World aWorld, EntityPlayer aPlayer, ItemStack aStack) {
public void onArmorTick(World aWorld, EntityPlayer aPlayer, ItemStack aStack) {
if (mSpecials == 0) return;
if (!aPlayer.worldObj.isRemote && (mSpecials & 1) != 0) {
@ -192,7 +195,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
if (GT_ModHandler.chargeElectricItem(tTargetChargeItem, 1, Integer.MAX_VALUE, true, true) < 1) {
tTargetChargeItem = aPlayer.inventory.armorInventory[2];
}
if (GT_ModHandler.dischargeElectricItem(tTargetDechargeItem, 10, Integer.MAX_VALUE, true, true, true) < 10) {
if (GT_ModHandler.dischargeElectricItem(tTargetDechargeItem, 10, Integer.MAX_VALUE, true, true, true, true) < 10) {
tTargetDechargeItem = aPlayer.inventory.armorInventory[2];
}
@ -209,8 +212,8 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
}
} else {
if ((mSpecials & 16) != 0 && tTargetDechargeItem != null && GT_ModHandler.canUseElectricItem(tTargetDechargeItem, 10)) {
if (aPlayer.worldObj.getBlockId ((int)aPlayer.posX, (int)aPlayer.posY+1, (int)aPlayer.posZ) == 0)
aPlayer.worldObj.setBlock ((int)aPlayer.posX, (int)aPlayer.posY+1, (int)aPlayer.posZ, GregTech_API.sBlockList[3].blockID);
if (aPlayer.worldObj.getBlock ((int)aPlayer.posX, (int)aPlayer.posY+1, (int)aPlayer.posZ) == Blocks.air)
aPlayer.worldObj.setBlock ((int)aPlayer.posX, (int)aPlayer.posY+1, (int)aPlayer.posZ, GregTech_API.sBlockList[3]);
GT_ModHandler.useElectricItem(tTargetDechargeItem, 10, aPlayer);
}
}
@ -223,9 +226,10 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
return true;
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(int aStack, CreativeTabs var2, List var3) {
public void getSubItems(Item aStack, CreativeTabs var2, List var3) {
ItemStack tCharged = new ItemStack(this, 1), tUncharged = new ItemStack(this, 1, getMaxDamage());
GT_ModHandler.chargeElectricItem(tCharged, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false);
var3.add(tCharged);
@ -237,17 +241,17 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
return mChargeProvider;
}
public int getChargedItemId(ItemStack aStack) {
public Item getChargedItem(ItemStack aStack) {
if ((mSpecials & 1024) != 0) setCharge(aStack);
return itemID;
return aStack.getItem();
}
public Item getEmptyItem(ItemStack aStack) {
if ((mSpecials & 1024) != 0) setCharge(aStack);
return aStack.getItem();
}
public int getEmptyItemId(ItemStack aStack) {
if ((mSpecials & 1024) != 0) setCharge(aStack);
return itemID;
}
public int getMaxCharge(ItemStack aStack) {
public double getMaxCharge(ItemStack aStack) {
if ((mSpecials & 1024) != 0) setCharge(aStack);
return mCharge;
}
@ -257,7 +261,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
return mTier;
}
public int getTransferLimit(ItemStack aStack) {
public double getTransferLimit(ItemStack aStack) {
if ((mSpecials & 1024) != 0) setCharge(aStack);
return mTransfer;
}
@ -277,7 +281,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
return false;
}
@ForgeSubscribe
@SubscribeEvent
public void onEntityLivingFallEvent(LivingFallEvent var1) {
if (!var1.entity.worldObj.isRemote && var1.entity instanceof EntityPlayer) {
EntityPlayer var2 = (EntityPlayer)var1.entity;
@ -286,8 +290,8 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
if (var3 != null && var3.getItem() == this && (mSpecials & 2) != 0) {
int var4 = (int)var1.distance - 3;
int var5 = (this.mDamageEnergyCost * var4) / 4;
if (var5 <= GT_ModHandler.dischargeElectricItem(var3, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true)) {
GT_ModHandler.dischargeElectricItem(var3, var5, Integer.MAX_VALUE, true, false, true);
if (var5 <= GT_ModHandler.dischargeElectricItem(var3, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true, false)) {
GT_ModHandler.dischargeElectricItem(var3, var5, Integer.MAX_VALUE, true, false, true, false);
var1.setCanceled(true);
break;
}
@ -298,7 +302,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
@Override
public ISpecialArmor.ArmorProperties getProperties(EntityLivingBase var1, ItemStack var2, DamageSource var3, double var4, int var6) {
return new ISpecialArmor.ArmorProperties((var3 == DamageSource.fall && (mSpecials & 2) != 0)?10:0, getBaseAbsorptionRatio() * mArmorAbsorbtionPercentage, mDamageEnergyCost > 0 ? 25 * GT_ModHandler.dischargeElectricItem(var2, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true) / mDamageEnergyCost : 0);
return new ISpecialArmor.ArmorProperties((var3 == DamageSource.fall && (mSpecials & 2) != 0)?10:0, getBaseAbsorptionRatio() * mArmorAbsorbtionPercentage, (int) (mDamageEnergyCost > 0 ? 25 * GT_ModHandler.dischargeElectricItem(var2, Integer.MAX_VALUE, Integer.MAX_VALUE, true, true, true, false) / mDamageEnergyCost : 0));
}
@Override
@ -308,7 +312,7 @@ public class GT_EnergyArmor_Item extends ItemArmor implements ISpecialArmor {
@Override
public void damageArmor(EntityLivingBase var1, ItemStack var2, DamageSource var3, int var4, int var5) {
GT_ModHandler.dischargeElectricItem(var2, var4 * mDamageEnergyCost, Integer.MAX_VALUE, true, false, true);
GT_ModHandler.dischargeElectricItem(var2, var4 * mDamageEnergyCost, Integer.MAX_VALUE, true, false, true, false);
}
public boolean isMetalArmor(ItemStack var1, EntityPlayer var2) {

4
src/main/java/gregtechmod/api/items/GT_EnergyStoreIC_Item.java
View file

@ -3,7 +3,7 @@ package gregtechmod.api.items;
import ic2.api.item.IElectricItem;
public class GT_EnergyStoreIC_Item extends GT_EnergyStore_Item implements IElectricItem {
public GT_EnergyStoreIC_Item(int aID, String aName, int aCharge, int aTransfer, int aTier, int aEmptyID, int aFullID) {
super(aID, aName, aCharge, aTransfer, aTier, aEmptyID, aFullID);
public GT_EnergyStoreIC_Item(String aName, int aCharge, int aTransfer, int aTier, int aEmptyID, int aFullID) {
super(aName, aCharge, aTransfer, aTier, aEmptyID, aFullID);
}
}

20
src/main/java/gregtechmod/api/items/GT_EnergyStore_Item.java
View file

@ -6,6 +6,7 @@ import gregtechmod.api.util.GT_ModHandler;
import java.util.List;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -13,8 +14,8 @@ import cpw.mods.fml.relauncher.SideOnly;
public class GT_EnergyStore_Item extends GT_Generic_Item {
public int mCharge, mTransfer, mTier, mEmptyID, mFullID;
public GT_EnergyStore_Item(int aID, String aName, int aCharge, int aTransfer, int aTier, int aEmptyID, int aFullID) {
super(aID, aName, null);
public GT_EnergyStore_Item(String aName, int aCharge, int aTransfer, int aTier, int aEmptyID, int aFullID) {
super(aName, null);
setMaxStackSize(1);
setMaxDamage(100);
setNoRepair();
@ -29,7 +30,8 @@ public class GT_EnergyStore_Item extends GT_Generic_Item {
return true;
}
@SideOnly(Side.CLIENT)
@SuppressWarnings({ "rawtypes", "unchecked" })
@SideOnly(Side.CLIENT)
public void getSubItems(int var1, CreativeTabs var2, List var3) {
ItemStack tCharged = GregTech_API.getGregTechItem(mFullID, 1, 0), tUncharged = GregTech_API.getGregTechItem(mEmptyID, 1, getMaxDamage());
GT_ModHandler.chargeElectricItem(tCharged, Integer.MAX_VALUE, Integer.MAX_VALUE, true, false);
@ -56,15 +58,15 @@ public class GT_EnergyStore_Item extends GT_Generic_Item {
return true;
}
public int getChargedItemId(ItemStack aStack) {
return GregTech_API.getGregTechItem(mFullID, 1, 0).itemID;
public Item getChargedItem(ItemStack itemStack) {
return GregTech_API.getGregTechItem(mFullID, 1, 0).getItem();
}
public int getEmptyItemId(ItemStack aStack) {
return GregTech_API.getGregTechItem(mEmptyID, 1, 0).itemID;
public Item getEmptyItem(ItemStack itemStack) {
return GregTech_API.getGregTechItem(mEmptyID, 1, 0).getItem();
}
public int getMaxCharge(ItemStack aStack) {
public double getMaxCharge(ItemStack aStack) {
return mCharge;
}
@ -72,7 +74,7 @@ public class GT_EnergyStore_Item extends GT_Generic_Item {
return mTier;
}
public int getTransferLimit(ItemStack aStack) {
public double getTransferLimit(ItemStack aStack) {
return mTransfer;
}
}

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

@ -2,13 +2,13 @@ package gregtechmod.api.items;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.util.GT_Config;
import gregtechmod.api.util.GT_LanguageManager;
import gregtechmod.api.util.GT_ModHandler;
import gregtechmod.api.util.GT_OreDictUnificator;
import java.util.List;
import net.minecraft.client.renderer.texture.IIconRegister;
import net.minecraft.client.resources.I18n;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
@ -26,14 +26,10 @@ public class GT_Generic_Item extends Item {
private final String mTooltip;
public GT_Generic_Item(String aName, String aTooltip) {
this(aName, aTooltip, true);
}
public GT_Generic_Item(String aName, String aTooltip, boolean aTranslateToolTip) {
super();
setUnlocalizedName(aName);
setCreativeTab(GregTech_API.TAB_GREGTECH);
mTooltip = aTooltip == null || aTooltip.equals("") ? "" : aTranslateToolTip ? GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_main", aTooltip) : aTooltip;
mTooltip = aTooltip == null || aTooltip.equals("") ? "" : aTooltip;
}
public final GT_Generic_Item registerAtOreDict(String aName, short aDamage) {
@ -60,8 +56,8 @@ public class GT_Generic_Item extends Item {
@Override
public final void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
if (getMaxDamage() > 0 && !getHasSubtypes()) aList.add((aStack.getMaxDamage() - aStack.getItemDamage()) + " / " + aStack.getMaxDamage());
if (mTooltip != null && !mTooltip.equals("")) aList.add(mTooltip);
if (GT_ModHandler.isElectricItem(aStack)) aList.add("Tier: " + getTier(aStack));
if (mTooltip != null && !mTooltip.equals("")) aList.add(I18n.format(mTooltip));
if (GT_ModHandler.isElectricItem(aStack)) aList.add(I18n.format("item.electric.tier.tooltip", getTier(aStack)));
addAdditionalToolTips(aList, aStack);
}

14
src/main/java/gregtechmod/api/items/GT_HardHammerMFR_Item.java
View file

@ -6,19 +6,15 @@ import java.util.List;
import net.minecraft.item.ItemStack;
public class GT_HardHammerMFR_Item extends GT_HardHammer_Item implements powercrystals.minefactoryreloaded.api.IToolHammerAdvanced {
public GT_HardHammerMFR_Item(int aID, String aName, int aMaxDamage, int aEntityDamage) {
super(aID, aName, aMaxDamage, aEntityDamage);
public class GT_HardHammerMFR_Item extends GT_HardHammer_Item implements powercrystals.minefactoryreloaded.api.IMFRHammer {
public GT_HardHammerMFR_Item(String aName, int aMaxDamage, int aEntityDamage) {
super(aName, aMaxDamage, aEntityDamage);
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addAdditionalToolTips(List aList, ItemStack aStack) {
super.addAdditionalToolTips(aList, aStack);
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_mfr", "Works as Minefactory Hammer too"));
}
@Override
public boolean isActive(ItemStack stack) {
return true;
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_mfr", "Works as Minefactory Hammer too")); // FIXME: LANG
}
}

49
src/main/java/gregtechmod/api/items/GT_HardHammer_Item.java
View file

@ -13,15 +13,15 @@ import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.entity.monster.EntityIronGolem;
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;
import net.minecraftforge.fluids.IFluidBlock;
public class GT_HardHammer_Item extends GT_Tool_Item {
public GT_HardHammer_Item(int aID, String aName, int aMaxDamage, int aEntityDamage) {
super(aID, aName, "To give a Machine a hard whack", aMaxDamage, aEntityDamage);
public GT_HardHammer_Item(String aName, int aMaxDamage, int aEntityDamage) {
super(aName, "To give a Machine a hard whack", aMaxDamage, aEntityDamage); // FIXME: lang
GregTech_API.registerHardHammer(new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE));
GT_OreDictUnificator.registerOre(GT_ToolDictNames.craftingToolHardHammer, new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE));
addToEffectiveList(EntityIronGolem.class.getName());
@ -46,10 +46,11 @@ public class GT_HardHammer_Item extends GT_Tool_Item {
setUsageAmounts(4, 3, 1);
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addAdditionalToolTips(List aList, ItemStack aStack) {
super.addAdditionalToolTips(aList, aStack);
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Used to craft Plates from Ingots"));
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Used to craft Plates from Ingots")); // FIXME LANG!!!
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Can rotate some Blocks as well"));
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_3", "Also used to toggle general Machine states"));
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_4", "Usable as Prospectors Hammer"));
@ -61,33 +62,32 @@ public class GT_HardHammer_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.wood || aBlock == Block.hay) {
if (aBlock == Blocks.log || aBlock == Blocks.hay_block) {
if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta + 4) % 12, 3);
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(1), 1.0F, -1, aX, aY, aZ);
}
return true;
}
if (aBlock == Block.pistonBase || aBlock == Block.pistonStickyBase || aBlock == Block.dispenser || aBlock == Block.dropper) {
if (aBlock == Blocks.piston || aBlock == Blocks.sticky_piston || aBlock == Blocks.dispenser || aBlock == Blocks.dropper) {
if (aMeta < 6 && GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta+1) % 6, 3);
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(1), 1.0F, -1, aX, aY, aZ);
}
return true;
}
if (aBlock == Block.pumpkin || aBlock == Block.pumpkinLantern || aBlock == Block.furnaceIdle || aBlock == Block.furnaceBurning || aBlock == Block.chest || aBlock == Block.chestTrapped) {
if (aBlock == Blocks.pumpkin || aBlock == Blocks.lit_pumpkin || aBlock == Blocks.furnace || aBlock == Blocks.lit_furnace || aBlock == Blocks.chest || aBlock == Blocks.trapped_chest) {
if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
aWorld.setBlockMetadataWithNotify(aX, aY, aZ, ((aMeta-1)%4)+2, 3);
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(1), 1.0F, -1, aX, aY, aZ);
}
return true;
}
if (aBlock == Block.hopperBlock) {
if (aBlock == Blocks.hopper) {
if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
aWorld.setBlockMetadataWithNotify(aX, aY, aZ, (aMeta+1)%6==1?(aMeta+1)%6:2, 3);
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(1), 1.0F, -1, aX, aY, aZ);
@ -102,30 +102,31 @@ public class GT_HardHammer_Item extends GT_Tool_Item {
return true;
}
if (aBlock.isGenMineableReplaceable(aWorld, aX, aY, aZ, Block.stone.blockID) || aBlock.isGenMineableReplaceable(aWorld, aX, aY, aZ, GregTech_API.sBlockList[5].blockID) || aBlock.isGenMineableReplaceable(aWorld, aX, aY, aZ, Block.netherrack.blockID) || aBlock.isGenMineableReplaceable(aWorld, aX, aY, aZ, Block.whiteStone.blockID)) {
if (aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.stone) || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, GregTech_API.sBlockList[5]) || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.netherrack) || aBlock.isReplaceableOreGen(aWorld, aX, aY, aZ, Blocks.end_stone)) {
if (GT_ModHandler.damageOrDechargeItem(aStack, 1, 1000, aPlayer)) {
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(1), 1.0F, -1, aX, aY, aZ);
int tX = aX, tY = aY, tZ = aZ, tBlockID = 0, tMetaID = 0;
Block tBlock = Blocks.air;
int tX = aX, tY = aY, tZ = aZ, tMetaID = 0;
for (byte i = 0; i < 7; i++) {
tX -= ForgeDirection.getOrientation(aSide).offsetX;
tY -= ForgeDirection.getOrientation(aSide).offsetY;
tZ -= ForgeDirection.getOrientation(aSide).offsetZ;
tBlockID = aWorld.getBlockId(tX, tY, tZ);
if (tBlockID == Block.lavaStill.blockID || tBlockID == Block.lavaMoving.blockID) {
GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Rock.");
tBlock = aWorld.getBlock(tX, tY, tZ);
if (tBlock == Blocks.lava || tBlock == Blocks.flowing_lava) {
GT_Utility.sendChatToPlayer(aPlayer, "There is Lava behind this Rock."); // FIXME LANG!!!
break;
}
if (tBlockID == Block.waterStill.blockID || tBlockID == Block.waterMoving.blockID || (tBlockID >= 0 && tBlockID < Block.blocksList.length && Block.blocksList[tBlockID] != null && Block.blocksList[tBlockID] instanceof IFluidBlock)) {
GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Rock.");
if (tBlock == Blocks.water || tBlock == Blocks.flowing_water || (tBlock != Blocks.air && tBlock != null && tBlock instanceof IFluidBlock)) {
GT_Utility.sendChatToPlayer(aPlayer, "There is a Liquid behind this Rock."); // FIXME LANG!!!
break;
}
if (tBlockID == Block.silverfish.blockID || !GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ)) {
GT_Utility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Rock.");
if (tBlock == Blocks.monster_egg || !GT_Utility.hasBlockHitBox(aWorld, tX, tY, tZ)) {
GT_Utility.sendChatToPlayer(aPlayer, "There is an Air Pocket behind this Rock."); // FIXME LANG!!!
break;
}
if (tBlockID != aBlock.blockID) {
if (i < 4) GT_Utility.sendChatToPlayer(aPlayer, "Material is changing behind this Rock.");
if (tBlock != aBlock) {
if (i < 4) GT_Utility.sendChatToPlayer(aPlayer, "Material is changing behind this Rock."); // FIXME LANG!!!
break;
}
}
@ -135,9 +136,9 @@ public class GT_HardHammer_Item extends GT_Tool_Item {
tX = aX-5+tRandom.nextInt(11);
tY = aY-5+tRandom.nextInt(11);
tZ = aZ-5+tRandom.nextInt(11);
tBlockID = aWorld.getBlockId(tX, tY, tZ);
tBlock = aWorld.getBlock(tX, tY, tZ);
tMetaID = aWorld.getBlockMetadata(tX, tY, tZ);
tString = GT_OreDictUnificator.getAssociation(new ItemStack(tBlockID, 1, tMetaID));
tString = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
if (tString != null && tString.startsWith("ore")) {
GT_Utility.sendChatToPlayer(aPlayer, "Found traces of " + GT_Utility.capitalizeString(tString.replaceFirst("ore", "")) + " Ore.");
GT_Utility.sendSoundToPlayers(aWorld, GregTech_API.sSoundList.get(1), 1.0F, -1, aX, aY, aZ);

17
src/main/java/gregtechmod/api/items/GT_RadioactiveCellIC_Item.java
View file

@ -9,12 +9,12 @@ import java.util.ArrayList;
import net.minecraft.item.ItemStack;
public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implements IReactorComponent {
public GT_RadioactiveCellIC_Item(int aID, String aName, int aMaxDelay, int aCellcount, int aPulseRate, ItemStack aDepleted) {
super(aID, aName, aMaxDelay, aCellcount, aPulseRate, aDepleted);
public GT_RadioactiveCellIC_Item(String aName, int aMaxDelay, int aCellcount, int aPulseRate, ItemStack aDepleted) {
super(aName, aMaxDelay, aCellcount, aPulseRate, aDepleted);
}
@Override
public boolean acceptUraniumPulse(IReactor aReactor, ItemStack aStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY) {
public boolean acceptUraniumPulse(IReactor aReactor, ItemStack aStack, ItemStack pulsingStack, int youX, int youY, int pulseX, int pulseY, boolean val) {
if (aStack.stackSize != 1) return false;
return aReactor.addOutput(1) > 0;
}
@ -44,7 +44,8 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
return aHeat;
}
public void processChamber(IReactor aReactor, ItemStack aStack, int x, int y) {
@Override
public void processChamber(IReactor aReactor, ItemStack aStack, int x, int y, boolean val) {
if (aStack.stackSize > 1) return;
if (aReactor.produceEnergy()) {
for (byte j = 0; j < cellCount; ++j) {
@ -53,12 +54,12 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
int tPulsables = 1 + cellCount / 2;
for (byte k = 0; k < tPulsables; ++k) {
acceptUraniumPulse(aReactor, aStack, aStack, x, y, x, y);
acceptUraniumPulse(aReactor, aStack, aStack, x, y, x, y, false);
}
tPulsables += checkPulseable(aReactor, x - 1, y, aStack, x, y) + this.checkPulseable(aReactor, x + 1, y, aStack, x, y) + this.checkPulseable(aReactor, x, y - 1, aStack, x, y) + this.checkPulseable(aReactor, x, y + 1, aStack, x, y);
int tAddedHeat = sumUp(tPulsables) * 4;
ArrayList tList = new ArrayList<ItemStackCoord>();
ArrayList<ItemStackCoord> tList = new ArrayList<ItemStackCoord>();
this.checkHeatAcceptor(aReactor, x - 1, y, tList);
this.checkHeatAcceptor(aReactor, x + 1, y, tList);
this.checkHeatAcceptor(aReactor, x, y - 1, tList);
@ -99,10 +100,10 @@ public class GT_RadioactiveCellIC_Item extends GT_RadioactiveCell_Item implement
protected int checkPulseable(IReactor var1, int var2, int var3, ItemStack var4, int var5, int var6) {
ItemStack var7 = var1.getItemAt(var2, var3);
return var7 != null && var7.getItem() instanceof IReactorComponent && ((IReactorComponent)var7.getItem()).acceptUraniumPulse(var1, var7, var4, var2, var3, var5, var6) ? 1 : 0;
return var7 != null && var7.getItem() instanceof IReactorComponent && ((IReactorComponent)var7.getItem()).acceptUraniumPulse(var1, var7, var4, var2, var3, var5, var6, false) ? 1 : 0;
}
protected void checkHeatAcceptor(IReactor var1, int var2, int var3, ArrayList var4) {
protected void checkHeatAcceptor(IReactor var1, int var2, int var3, ArrayList<ItemStackCoord> var4) {
ItemStack var5 = var1.getItemAt(var2, var3);
if (var5 != null && var5.getItem() instanceof IReactorComponent && ((IReactorComponent)var5.getItem()).canStoreHeat(var1, var5, var2, var3)) {

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

@ -12,8 +12,8 @@ public class GT_RadioactiveCell_Item extends GT_Generic_Item implements ICapsule
protected int maxDelay, cellCount, pulserate;
protected ItemStack mDepleted;
public GT_RadioactiveCell_Item(int aID, String aName, int aMaxDelay, int aCellcount, int aPulseRate, ItemStack aDepleted) {
super(aID, aName, null);
public GT_RadioactiveCell_Item(String aName, int aMaxDelay, int aCellcount, int aPulseRate, ItemStack aDepleted) {
super(aName, null);
setMaxStackSize(1);
setMaxDamage(10000);
setNoRepair();
@ -97,6 +97,7 @@ public class GT_RadioactiveCell_Item extends GT_Generic_Item implements ICapsule
return b;
}
@SuppressWarnings({ "unchecked", "rawtypes" })
@Override
public void addAdditionalToolTips(List aList, ItemStack aStack) {
super.addAdditionalToolTips(aList, aStack);

4
src/main/java/gregtechmod/api/items/GT_SawIC_Item.java
View file

@ -3,7 +3,7 @@ package gregtechmod.api.items;
import ic2.api.item.IElectricItem;
public class GT_SawIC_Item extends GT_Saw_Item implements IElectricItem {
public GT_SawIC_Item(int aID, String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) {
super(aID, aName, aMaxDamage, aEntityDamage, aToolQuality, aToolStrength, aEnergyConsumptionPerBlockBreak, aDisChargedGTID);
public GT_SawIC_Item(String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) {
super(aName, aMaxDamage, aEntityDamage, aToolQuality, aToolStrength, aEnergyConsumptionPerBlockBreak, aDisChargedGTID);
}
}

2
src/main/java/gregtechmod/api/items/GT_Saw_Item.java
View file

@ -11,7 +11,7 @@ import net.minecraft.item.ItemStack;
public class GT_Saw_Item extends GT_Tool_Item {
public GT_Saw_Item(String aName, int aMaxDamage, int aEntityDamage, int aToolQuality, float aToolStrength, int aEnergyConsumptionPerBlockBreak, int aDisChargedGTID) {
super(aName, "For sawing Logs into Planks", aMaxDamage, aEntityDamage, -1, aDisChargedGTID, aToolQuality, aToolStrength);
super(aName, "For sawing Logs into Planks", aMaxDamage, aEntityDamage, -1, aDisChargedGTID, aToolQuality, aToolStrength); // FIXME lang
//GregTech_API.registerSaw(new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE));
GT_OreDictUnificator.registerOre(GT_ToolDictNames.craftingToolSaw, new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE));
addToBlockList(GT_ModHandler.getIC2Item("rubberLeaves", 1));

4
src/main/java/gregtechmod/api/items/GT_SolderingToolIC_Item.java
View file

@ -3,7 +3,7 @@ package gregtechmod.api.items;
import ic2.api.item.IElectricItem;
public class GT_SolderingToolIC_Item extends GT_SolderingTool_Item implements IElectricItem {
public GT_SolderingToolIC_Item(int aID, String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) {
super(aID, aName, aMaxDamage, aEntityDamage, aDischargedGTID);
public GT_SolderingToolIC_Item(String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) {
super(aName, aMaxDamage, aEntityDamage, aDischargedGTID);
}
}

9
src/main/java/gregtechmod/api/items/GT_SolderingTool_Item.java
View file

@ -12,8 +12,8 @@ import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
public class GT_SolderingTool_Item extends GT_Tool_Item {
public GT_SolderingTool_Item(int aID, String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) {
super(aID, aName, "To repair and construct Circuitry", aMaxDamage, aEntityDamage, -1, aDischargedGTID);
public GT_SolderingTool_Item(String aName, int aMaxDamage, int aEntityDamage, int aDischargedGTID) {
super(aName, "To repair and construct Circuitry", aMaxDamage, aEntityDamage, -1, aDischargedGTID); // FIXME: LANG
GT_OreDictUnificator.registerOre(GT_ToolDictNames.craftingToolSolderingIron, new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE));
GregTech_API.registerSolderingTool(new ItemStack(this, 1, GregTech_API.ITEM_WILDCARD_DAMAGE));
setCraftingSound(GregTech_API.sSoundList.get(103));
@ -21,10 +21,11 @@ public class GT_SolderingTool_Item extends GT_Tool_Item {
setEntityHitSound(GregTech_API.sSoundList.get(103));
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addAdditionalToolTips(List aList, ItemStack aStack) {
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Sets the Strength of outputted Redstone"));
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Needs Soldering Metal in Inventory!"));
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_1", "Sets the Strength of outputted Redstone")); // FIXME: LANG
aList.add(GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".tooltip_2", "Needs Soldering Metal in Inventory!")); // FIXME: LANG
}
@Override

6
src/main/java/gregtechmod/api/items/GT_Spray_Bug_Item.java
View file

@ -10,6 +10,7 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.monster.EntityCaveSpider;
import net.minecraft.entity.monster.EntitySpider;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
@ -42,8 +43,8 @@ public class GT_Spray_Bug_Item extends GT_Tool_Item {
}
@Override
public ItemStack getEmptyItem(ItemStack aStack) {
return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1);
public Item getEmptyItem(ItemStack aStack) {
return GT_OreDictUnificator.getFirstOre("craftingSprayCan", 1).getItem();
}
@Override
@ -54,7 +55,6 @@ public class GT_Spray_Bug_Item extends GT_Tool_Item {
}
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);
try {

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

@ -55,7 +55,7 @@ public class GT_Tool_Item extends GT_Generic_Item {
}
public GT_Tool_Item(String aName, String aTooltip, int aMaxDamage, int aEntityDamage, int aChargedGTID, int aDisChargedGTID, int aToolQuality, float aToolStrength) {
super(aName, aTooltip, aTooltip != null && !aTooltip.equals("Doesn't work as intended, this is a Bug"));
super(aName, aTooltip);
mEntityDamage = aEntityDamage;
mDisChargedGTID = aDisChargedGTID;
mChargedGTID = aChargedGTID;
@ -213,7 +213,11 @@ public class GT_Tool_Item extends GT_Generic_Item {
}
}
public ItemStack getEmptyItem(ItemStack aStack) {
public Item getEmptyItem(ItemStack aStack) {
return null;
}
public Item getChargedItem(ItemStack itemStack) {
return null;
}
@ -278,7 +282,7 @@ public class GT_Tool_Item extends GT_Generic_Item {
aStack = GT_Utility.copy(aStack);
if (aStack.getItemDamage() > aStack.getMaxDamage()) {
GT_Utility.doSoundAtClient(mBreakingSound, mBreakingSoundStrength);
ItemStack tStack = getEmptyItem(aStack);
ItemStack tStack = new ItemStack(getEmptyItem(aStack));
if (tStack != null) return tStack;
} else {
GT_Utility.doSoundAtClient(mCraftingSound, mCraftingSoundStrength);
@ -409,7 +413,7 @@ public class GT_Tool_Item extends GT_Generic_Item {
return false;
}
public final int getMaxCharge(ItemStack aStack) {
public final double getMaxCharge(ItemStack aStack) {
return getMaxDamage() * 1000;
}
@ -418,7 +422,7 @@ public class GT_Tool_Item extends GT_Generic_Item {
return mTier;
}
public final int getTransferLimit(ItemStack aStack) {
return (int)(Math.pow(2, mTier) * 128);
public final double getTransferLimit(ItemStack aStack) {
return Math.pow(2, mTier) * 128;
}
}

2
src/main/java/gregtechmod/common/items/GT_Debug_Item.java
View file

@ -78,7 +78,7 @@ public class GT_Debug_Item extends GT_Generic_Item implements IElectricItem {
@Override
public boolean onItemUseFirst(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float aClickX, float aClickY, float aClickZ) {
if (aWorld.isRemote) {
// GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(108), 1.0F, aX, aY, aZ);
// GT_Utility.doSoundAtClient(GregTech_API.sSoundList.get(108), 1.0F, aX, aY, aZ); // FIXME sound
return false;
}
if (aPlayer instanceof EntityPlayerMP && GT_ModHandler.canUseElectricItem(aStack, 25000)) {

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

@ -56,7 +56,9 @@ public class GT_MetaItem_Abstract extends Item {
@SuppressWarnings({ "rawtypes", "unchecked" })
@Override
public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
if (aStack.getItemDamage() >= 0 && aStack.getItemDamage() < MAXIMUM_META_IDS && !mToolTipList[aStack.getItemDamage()].equals("")) aList.add(mToolTipList[aStack.getItemDamage()]);
if (aStack.getItemDamage() >= 0 && aStack.getItemDamage() < MAXIMUM_META_IDS && !mToolTipList[aStack.getItemDamage()].equals("")) {
aList.add(mToolTipList[aStack.getItemDamage()]);
}
}
@Override

3
src/main/java/gregtechmod/common/items/GT_MetaItem_Cell.java
View file

@ -4,7 +4,6 @@ import gregtechmod.api.GregTech_API;
import gregtechmod.api.enums.Materials;
import gregtechmod.api.enums.OrePrefixes;
import gregtechmod.api.interfaces.ICapsuleCellContainer;
import gregtechmod.api.util.GT_LanguageManager;
import gregtechmod.api.util.GT_ModHandler;
import gregtechmod.api.util.GT_OreDictUnificator;
import net.minecraft.item.ItemStack;
@ -23,8 +22,6 @@ public class GT_MetaItem_Cell extends GT_MetaItem_Abstract implements ICapsuleCe
}
public static ItemStack addItem(int aMeta, String aName, String aOreDictName, boolean aPlasma, Materials aMaterial) {
GT_LanguageManager.addStringLocalization(instance.getUnlocalizedName() + "." + aMeta + ".name", aName);
instance.mToolTipList[aMeta] = aMaterial.getToolTip(OrePrefixes.cell.mMaterialAmount / GregTech_API.MATERIAL_UNIT);
instance.mStackList[aMeta] = new ItemStack(instance, 1, aMeta);

5
src/main/java/gregtechmod/common/items/GT_MetaItem_Component.java
View file

@ -1,6 +1,5 @@
package gregtechmod.common.items;
import gregtechmod.api.util.GT_LanguageManager;
import gregtechmod.api.util.GT_OreDictUnificator;
import net.minecraft.item.ItemStack;
@ -18,9 +17,7 @@ public class GT_MetaItem_Component extends GT_MetaItem_Abstract {
}
public static ItemStack addItem(int aMeta, String aName, String aMaterial, String aToolTip) {
GT_LanguageManager.addStringLocalization(instance.getUnlocalizedName() + "." + aMeta + ".name", aName);
instance.mToolTipList[aMeta] = GT_LanguageManager.addStringLocalization(instance.getUnlocalizedName() + "." + aMeta + ".tooltip", aToolTip);
instance.mToolTipList[aMeta] = instance.getUnlocalizedName() + "." + aMeta + ".tooltip";
instance.mStackList[aMeta] = new ItemStack(instance, 1, aMeta);
if (aMaterial != null && !aMaterial.equals("")) {

3
src/main/java/gregtechmod/common/items/GT_MetaItem_DirtyDust.java
View file

@ -3,7 +3,6 @@ package gregtechmod.common.items;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.enums.Materials;
import gregtechmod.api.enums.OrePrefixes;
import gregtechmod.api.util.GT_LanguageManager;
import gregtechmod.api.util.GT_OreDictUnificator;
import net.minecraft.item.ItemStack;
@ -22,8 +21,6 @@ public class GT_MetaItem_DirtyDust extends GT_MetaItem_Abstract {
@SuppressWarnings("deprecation")
public static ItemStack addItem(int aMeta, String aName, Materials aMaterial, boolean aGlow) {
GT_LanguageManager.addStringLocalization(instance.getUnlocalizedName() + "." + aMeta + ".name", "Dirty Pile of " + aName);
instance.mToolTipList[aMeta] = aMaterial.getToolTip(OrePrefixes.dustImpure.mMaterialAmount / GregTech_API.MATERIAL_UNIT);
instance.mGlowList[aMeta] = aGlow;
instance.mStackList[aMeta] = new ItemStack(instance, 1, aMeta);

3
src/main/java/gregtechmod/common/items/GT_MetaItem_Dust.java
View file

@ -3,7 +3,6 @@ package gregtechmod.common.items;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.enums.Materials;
import gregtechmod.api.enums.OrePrefixes;
import gregtechmod.api.util.GT_LanguageManager;
import gregtechmod.api.util.GT_OreDictUnificator;
import net.minecraft.item.ItemStack;
@ -21,8 +20,6 @@ public class GT_MetaItem_Dust extends GT_MetaItem_Abstract {
}
public static ItemStack addItem(int aMeta, String aName, Materials aMaterial, boolean aGlow) {
GT_LanguageManager.addStringLocalization(instance.getUnlocalizedName() + "." + aMeta + ".name", aName);
instance.mToolTipList[aMeta] = aMaterial.getToolTip(OrePrefixes.dust.mMaterialAmount / GregTech_API.MATERIAL_UNIT);
instance.mGlowList[aMeta] = aGlow;
instance.mStackList[aMeta] = new ItemStack(instance, 1, aMeta);

5
src/main/java/gregtechmod/common/items/GT_MetaItem_Material.java
View file

@ -4,7 +4,6 @@ import gregtechmod.api.GregTech_API;
import gregtechmod.api.enums.MaterialStack;
import gregtechmod.api.enums.Materials;
import gregtechmod.api.enums.OrePrefixes;
import gregtechmod.api.util.GT_LanguageManager;
import gregtechmod.api.util.GT_OreDictUnificator;
import net.minecraft.item.ItemStack;
@ -21,9 +20,7 @@ public class GT_MetaItem_Material extends GT_MetaItem_Abstract {
return instance.mStackList;
}
public static ItemStack addItem(int aMeta, String aName, OrePrefixes aPrefix, Object aMaterial, boolean aGlowing) {
GT_LanguageManager.addStringLocalization(instance.getUnlocalizedName() + "." + aMeta + ".name", aName);
public static ItemStack addItem(int aMeta, String aName, OrePrefixes aPrefix, Object aMaterial, boolean aGlowing) {
instance.mToolTipList[aMeta] = aMaterial==null?"":(aMaterial instanceof Materials)?((Materials)aMaterial).getToolTip(aPrefix.mMaterialAmount / GregTech_API.MATERIAL_UNIT):aMaterial.toString();
instance.mGlowList[aMeta] = aGlowing;
instance.mStackList[aMeta] = new ItemStack(instance, 1, aMeta);

3
src/main/java/gregtechmod/common/items/GT_MetaItem_Nugget.java
View file

@ -3,7 +3,6 @@ package gregtechmod.common.items;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.enums.Materials;
import gregtechmod.api.enums.OrePrefixes;
import gregtechmod.api.util.GT_LanguageManager;
import gregtechmod.api.util.GT_OreDictUnificator;
import net.minecraft.client.resources.I18n;
import net.minecraft.item.ItemStack;
@ -22,8 +21,6 @@ public class GT_MetaItem_Nugget extends GT_MetaItem_Abstract {
}
public static ItemStack addItem(int aMeta, Materials aMaterial, boolean aGlow) {
GT_LanguageManager.addStringLocalization(instance.getUnlocalizedName() + "." + aMeta + ".name", aMaterial + " Nugget");
instance.mToolTipList[aMeta] = aMaterial.getToolTip(OrePrefixes.nugget.mMaterialAmount / GregTech_API.MATERIAL_UNIT);
instance.mGlowList[aMeta] = aGlow;

3
src/main/java/gregtechmod/common/items/GT_MetaItem_SmallDust.java
View file

@ -3,7 +3,6 @@ package gregtechmod.common.items;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.enums.Materials;
import gregtechmod.api.enums.OrePrefixes;
import gregtechmod.api.util.GT_LanguageManager;
import gregtechmod.api.util.GT_OreDictUnificator;
import net.minecraft.item.ItemStack;
@ -21,8 +20,6 @@ public class GT_MetaItem_SmallDust extends GT_MetaItem_Abstract {
}
public static ItemStack addItem(int aMeta, String aName, Materials aMaterial, boolean aGlow) {
GT_LanguageManager.addStringLocalization(instance.getUnlocalizedName() + "." + aMeta + ".name", "Small Pile of " + aName);
instance.mToolTipList[aMeta] = aMaterial.getToolTip(OrePrefixes.dustSmall.mMaterialAmount / GregTech_API.MATERIAL_UNIT);
instance.mGlowList[aMeta] = aGlow;
instance.mStackList[aMeta] = new ItemStack(instance, 1, aMeta);

3
src/main/java/gregtechmod/common/items/GT_MetaItem_TinyDust.java
View file

@ -3,7 +3,6 @@ package gregtechmod.common.items;
import gregtechmod.api.GregTech_API;
import gregtechmod.api.enums.Materials;
import gregtechmod.api.enums.OrePrefixes;
import gregtechmod.api.util.GT_LanguageManager;
import gregtechmod.api.util.GT_OreDictUnificator;
import net.minecraft.item.ItemStack;
@ -21,8 +20,6 @@ public class GT_MetaItem_TinyDust extends GT_MetaItem_Abstract {
}
public static ItemStack addItem(int aMeta, String aName, Materials aMaterial, boolean aGlow) {
GT_LanguageManager.addStringLocalization(instance.getUnlocalizedName() + "." + aMeta + ".name", "Tiny Pile of " + aName);
instance.mToolTipList[aMeta] = aMaterial.getToolTip(OrePrefixes.dustTiny.mMaterialAmount / GregTech_API.MATERIAL_UNIT);
instance.mGlowList[aMeta] = aGlow;
instance.mStackList[aMeta] = new ItemStack(instance, 1, aMeta);

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

@ -500,8 +500,8 @@ public class GT_ItemLoader implements Runnable {
GregTech_API.sItemList[ 16] = new GT_SensorCard_Item (GT_LanguageManager.mNameListItem[ 16]);
GregTech_API.sItemList[ 17] = new GT_SensorKit_Item (GT_LanguageManager.mNameListItem[ 17]);
} catch (Throwable e) {
GregTech_API.sItemList[ 16] = new GT_Generic_Item (GT_LanguageManager.mNameListItem[ 16], "Nuclear Control not installed", false);
GregTech_API.sItemList[ 17] = new GT_Generic_Item (GT_LanguageManager.mNameListItem[ 17], "Nuclear Control not installed", false);
GregTech_API.sItemList[ 16] = new GT_Generic_Item (GT_LanguageManager.mNameListItem[ 16], "Nuclear Control not installed");
GregTech_API.sItemList[ 17] = new GT_Generic_Item (GT_LanguageManager.mNameListItem[ 17], "Nuclear Control not installed");
}
GregTech_API.sItemList[ 18] = GregTech_API.constructElectricArmorItem (GT_LanguageManager.mNameListItem[ 18], 1000000000, Integer.MAX_VALUE, 1, 10, -1, 100.0D, true, 1, tArmorID1);

5
src/main/resources/assets/gregtech_addon/lang/en_US.lang
View file

@ -902,5 +902,8 @@ item.Teslastaff.name=Tesla Staff
item.Thoriumcell.name=Thorium Cell
item.Ultimate_Cheat_Armor.name=Ultimate Cheat Armor
itemGroup.GregTech=GregTech Intergalactical
item.electric.tier.tooltip=Tier: %s
item.bug.tooltip=Doesn't work as intended, this is a Bug
itemGroup.gregtech=GregTech Intergalactical
block.deny_mobs_spawn.tooltip=Mobs can't spawn on this block