diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2018-09-19 20:14:31 +0200 |
|---|---|---|
| committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2018-09-19 20:14:31 +0200 |
| commit | b5529dcc6b0cde98c9f2b97408503136385b569f (patch) | |
| tree | c39b1a1e9e1ef170e31acb9b659add270aad9ece /src/main/java/gregtech/api/util | |
| parent | 3cce53ccc294c7686d2c4b7bffbedc6e182cb06d (diff) | |
| download | GT5-Unofficial-b5529dcc6b0cde98c9f2b97408503136385b569f.tar.gz GT5-Unofficial-b5529dcc6b0cde98c9f2b97408503136385b569f.tar.bz2 GT5-Unofficial-b5529dcc6b0cde98c9f2b97408503136385b569f.zip | |
added explosion log
+readded GalacticraftFiles for @mitchej123 GC Compat
+fixed a typo in IGregTechTileEntity
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 2e420f13cd..677033bb1a 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;
}
|