diff options
| author | Dream-Master <dream-master@gmx.net> | 2018-10-18 20:08:16 +0200 |
|---|---|---|
| committer | Dream-Master <dream-master@gmx.net> | 2018-10-18 20:08:16 +0200 |
| commit | 1bde4a911eb60b0a294c7a2663e521ef5175db1b (patch) | |
| tree | f98d6ae8842c61fbbe7da96a3d835ddb96034a59 /src/main/java/gregtech/api/util | |
| parent | b25533322785b9101bc005af1510e6cfddf5cece (diff) | |
| parent | a53ca90e7fa20af828e313fd3a82ae211caf0acb (diff) | |
| download | GT5-Unofficial-1bde4a911eb60b0a294c7a2663e521ef5175db1b.tar.gz GT5-Unofficial-1bde4a911eb60b0a294c7a2663e521ef5175db1b.tar.bz2 GT5-Unofficial-1bde4a911eb60b0a294c7a2663e521ef5175db1b.zip | |
Merge branch 'experimental' into GT_dev
# Conflicts:
# src/main/java/gregtech/common/tileentities/generators/GT_MetaTileEntity_MagicalEnergyAbsorber.java
Diffstat (limited to 'src/main/java/gregtech/api/util')
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Log.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/api/util/GT_Recipe.java | 25 |
2 files changed, 21 insertions, 6 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Log.java b/src/main/java/gregtech/api/util/GT_Log.java index 2b840c1b1e..c336eed094 100644 --- a/src/main/java/gregtech/api/util/GT_Log.java +++ b/src/main/java/gregtech/api/util/GT_Log.java @@ -16,9 +16,11 @@ public class GT_Log { public static PrintStream err = System.err; public static PrintStream ore = new LogBuffer(); public static PrintStream pal = null; + public static PrintStream exp = new LogBuffer(); public static File mLogFile; public static File mOreDictLogFile; public static File mPlayerActivityLogFile; + public static File mExplosionLog; public static class LogBuffer extends PrintStream { public final List<String> mBufferedOreDictLog = new ArrayList<String>(); diff --git a/src/main/java/gregtech/api/util/GT_Recipe.java b/src/main/java/gregtech/api/util/GT_Recipe.java index 234dc994d8..705d2a342f 100644 --- a/src/main/java/gregtech/api/util/GT_Recipe.java +++ b/src/main/java/gregtech/api/util/GT_Recipe.java @@ -1006,8 +1006,10 @@ public class GT_Recipe implements Comparable<GT_Recipe> { || GT_Utility.areStacksEqual(tStack, new ItemStack(Items.fireworks, 1, W), true)
|| GT_Utility.areStacksEqual(tStack, new ItemStack(Items.fire_charge, 1, W), true)
) {
- if (aTileEntity instanceof IGregTechTileEntity)
+ if (aTileEntity instanceof IGregTechTileEntity) {
+ GT_Log.exp.println("Microwave Explosion due to TNT || EGG || FIREWORKCHARGE || FIREWORK || FIRE CHARGE");
((IGregTechTileEntity) aTileEntity).doExplosion(aVoltage * 4);
+ }
return null;
}
ItemData tData = GT_OreDictUnificator.getItemData(tStack);
@@ -1016,32 +1018,43 @@ public class GT_Recipe implements Comparable<GT_Recipe> { if (tData != null) {
if (tData.mMaterial != null && tData.mMaterial.mMaterial != null) {
if (tData.mMaterial.mMaterial.contains(SubTag.METAL) || tData.mMaterial.mMaterial.contains(SubTag.EXPLOSIVE)) {
- if (aTileEntity instanceof IGregTechTileEntity)
+ if (aTileEntity instanceof IGregTechTileEntity) {
+ GT_Log.exp.println("Microwave Explosion due to METAL insertion");
((IGregTechTileEntity) aTileEntity).doExplosion(aVoltage * 4);
+ }
return null;
}
if (tData.mMaterial.mMaterial.contains(SubTag.FLAMMABLE)) {
- if (aTileEntity instanceof IGregTechTileEntity)
+ if (aTileEntity instanceof IGregTechTileEntity) {
+ GT_Log.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");
((IGregTechTileEntity) aTileEntity).setOnFire();
+ }
return null;
}
}
for (MaterialStack tMaterial : tData.mByProducts)
if (tMaterial != null) {
if (tMaterial.mMaterial.contains(SubTag.METAL) || tMaterial.mMaterial.contains(SubTag.EXPLOSIVE)) {
- if (aTileEntity instanceof IGregTechTileEntity)
+ if (aTileEntity instanceof IGregTechTileEntity) {
+ GT_Log.exp.println("Microwave Explosion due to METAL insertion");
((IGregTechTileEntity) aTileEntity).doExplosion(aVoltage * 4);
+ }
return null;
}
if (tMaterial.mMaterial.contains(SubTag.FLAMMABLE)) {
- if (aTileEntity instanceof IGregTechTileEntity)
+ if (aTileEntity instanceof IGregTechTileEntity) {
((IGregTechTileEntity) aTileEntity).setOnFire();
+ GT_Log.exp.println("Microwave INFLAMMATION due to FLAMMABLE insertion");
+ }
return null;
}
}
}
if (TileEntityFurnace.getItemBurnTime(tStack) > 0) {
- if (aTileEntity instanceof IGregTechTileEntity) ((IGregTechTileEntity) aTileEntity).setOnFire();
+ if (aTileEntity instanceof IGregTechTileEntity) {
+ ((IGregTechTileEntity) aTileEntity).setOnFire();
+ GT_Log.exp.println("Microwave INFLAMMATION due to BURNABLE insertion");
+ }
return null;
}
|