Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Exploding GT machines now drop randomly some of their crafting components.

Browse source
This commit is contained in:
Blood-Asp 2016-10-17 12:37:13 +02:00 committed by Technus
parent 2abfaa0fc6
commit 14304fceb8
2 changed files with 31 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
View file

@ -1092,7 +1092,6 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
@Override
public void doExplosion(long aAmount) {
System.out.println("doExplosion");
if (canAccessData()) {
// This is only for Electric Machines
if (GregTech_API.sMachineWireFire && mMetaTileEntity.isElectric()) {
@ -1105,36 +1104,45 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
// Normal Explosion Code
mMetaTileEntity.onExplosion();
if(GT_Mod.gregtechproxy.mExplosionItemDrop){
Random tRandom = new Random();
for (int i = 0; i < this.getSizeInventory(); i++) {
ItemStack tItem = this.getStackInSlot(i);
System.out.println("getInventory: "+i);
if ((tItem != null) && (tItem.stackSize > 0) && (this.isValidSlot(i))) {
EntityItem tItemEntity = new EntityItem(this.worldObj, this.xCoord + tRandom.nextFloat() * 0.8F + 0.1F, this.yCoord + tRandom.nextFloat() * 0.8F + 0.1F, this.zCoord + tRandom.nextFloat() * 0.8F + 0.1F, new ItemStack(tItem.getItem(), tItem.stackSize, tItem.getItemDamage()));
if (tItem.hasTagCompound()) {
tItemEntity.getEntityItem().setTagCompound((NBTTagCompound) tItem.getTagCompound().copy());
}
tItemEntity.motionX = (tRandom.nextGaussian() * 0.0500000007450581D);
tItemEntity.motionY = (tRandom.nextGaussian() * 0.0500000007450581D + 0.2000000029802322D);
tItemEntity.motionZ = (tRandom.nextGaussian() * 0.0500000007450581D);
tItemEntity.hurtResistantTime = 999999;
tItemEntity.lifespan = 60000;
try {
Field tField = tItemEntity.getClass().getDeclaredField("health");
tField.setAccessible(true);
tField.setInt(tItemEntity, 99999999);
} catch (Exception e) {e.printStackTrace();}
this.worldObj.spawnEntityInWorld(tItemEntity);
System.out.println("spawnItem: "+tItemEntity.getEntityItem().getDisplayName());
tItem.stackSize = 0;
this.setInventorySlotContents(i, null);
dropItems(tItem);
this.setInventorySlotContents(i, null); }
}
}
if (mRecipeStuff != null) {
for (int i = 0; i < 9; i++) {
if (this.getRandomNumber(100) < 50) {
dropItems(GT_Utility.loadItem(mRecipeStuff, "Ingredient." + i));
}
}
}
}
mMetaTileEntity.doExplosion(aAmount);
}
}
public void dropItems(ItemStack tItem){
if(tItem==null)return;
Random tRandom = new Random();
EntityItem tItemEntity = new EntityItem(this.worldObj, this.xCoord + tRandom.nextFloat() * 0.8F + 0.1F, this.yCoord + tRandom.nextFloat() * 0.8F + 0.1F, this.zCoord + tRandom.nextFloat() * 0.8F + 0.1F, new ItemStack(tItem.getItem(), tItem.stackSize, tItem.getItemDamage()));
if (tItem.hasTagCompound()) {
tItemEntity.getEntityItem().setTagCompound((NBTTagCompound) tItem.getTagCompound().copy());
}
tItemEntity.motionX = (tRandom.nextGaussian() * 0.0500000007450581D);
tItemEntity.motionY = (tRandom.nextGaussian() * 0.0500000007450581D + 0.2000000029802322D);
tItemEntity.motionZ = (tRandom.nextGaussian() * 0.0500000007450581D);
tItemEntity.hurtResistantTime = 999999;
tItemEntity.lifespan = 60000;
try {
Field tField = tItemEntity.getClass().getDeclaredField("health");
tField.setAccessible(true);
tField.setInt(tItemEntity, 99999999);
} catch (Exception e) {e.printStackTrace();}
this.worldObj.spawnEntityInWorld(tItemEntity);
tItem.stackSize = 0;
}
@Override
public ArrayList<ItemStack> getDrops() {
ItemStack rStack = new ItemStack(GregTech_API.sBlockMachines, 1, mID);

2
src/main/java/gregtech/loaders/misc/GT_Achievements.java
View file

@ -486,7 +486,7 @@ public class GT_Achievements {
return;
}
ItemData data = GT_OreDictUnificator.getItemData(stack);
if (data != null) {
if (data != null && data.mPrefix!=null) {
if (data.mPrefix == OrePrefixes.dust) {
if (data.mMaterial.mMaterial == Materials.Lutetium) {
issueAchievement(player, "newmetal");