diff options
| author | Technus <daniel112092@gmail.com> | 2017-09-09 21:04:20 +0200 |
|---|---|---|
| committer | Technus <daniel112092@gmail.com> | 2017-09-09 21:05:00 +0200 |
| commit | e346b566c913e2ae7fad884ba84c2372532a42d1 (patch) | |
| tree | dcf79f2af785c044148306f1b57012844617d668 /src/main | |
| parent | 258f37066093a6b1ebb5d2a2e24157eaaa2ee866 (diff) | |
| download | GT5-Unofficial-e346b566c913e2ae7fad884ba84c2372532a42d1.tar.gz GT5-Unofficial-e346b566c913e2ae7fad884ba84c2372532a42d1.tar.bz2 GT5-Unofficial-e346b566c913e2ae7fad884ba84c2372532a42d1.zip | |
Nerf microwave a bit
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/loader/MainLoader.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java index 95f8a2ed53..4259078c69 100644 --- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java +++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java @@ -29,7 +29,7 @@ import static com.github.technus.tectech.compatibility.thaumcraft.EssentiaCompat import static com.github.technus.tectech.compatibility.thaumcraft.definitions.AspectDefinitionCompat.aspectDefinitionCompat; import static gregtech.api.enums.GT_Values.W; -public final class MainLoader {//TODO add checks for - is mod loaded dreamcraft to enable higher tier machinery. (above UV), or implement a check for GT tier values. +public final class MainLoader { public static DamageSource microwaving, elementalPollution; public void load() { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java index 3d0e6f78ce..e845f9d814 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_microwave.java @@ -188,9 +188,13 @@ public class GT_MetaTileEntity_TM_microwave extends GT_MetaTileEntity_Multiblock yPos+(flipped?.5:2.5), zPos+1.5+zDirShift); - int damagingFactor = powerSetting >> 9; - boolean inside=true; + int damagingFactor = + Math.min(powerSetting >> 6,8)+ + Math.min(powerSetting >> 8,24)+ + Math.min(powerSetting >> 12,48)+ + powerSetting >> 18; + boolean inside=true; do { for (Object entity : mte.getWorld().getEntitiesWithinAABBExcludingEntity(null, aabb)) { if (entity instanceof Entity) { |