diff options
Diffstat (limited to 'src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java')
-rw-r--r-- | src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java index 4e90c2634c..eb5b80176a 100644 --- a/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java +++ b/src/main/java/kubatech/tileentity/gregtech/multiblock/MTEExtremeEntityCrusher.java @@ -54,7 +54,6 @@ import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.EnumCreatureAttribute; import net.minecraft.entity.SharedMonsterAttributes; -import net.minecraft.entity.ai.attributes.AttributeModifier; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.Item; @@ -75,7 +74,6 @@ import net.minecraftforge.fluids.FluidStack; import org.jetbrains.annotations.NotNull; -import com.google.common.collect.Multimap; import com.gtnewhorizon.structurelib.alignment.IAlignmentLimits; import com.gtnewhorizon.structurelib.alignment.constructable.ISurvivalConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; @@ -497,8 +495,7 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme isValid = false; return; } - // noinspection unchecked - attackDamage = ((Multimap<String, AttributeModifier>) stack.getAttributeModifiers()) + attackDamage = stack.getAttributeModifiers() .get(SharedMonsterAttributes.attackDamage.getAttributeUnlocalizedName()) .stream() .mapToDouble( @@ -559,7 +556,7 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme double attackDamage = DIAMOND_SPIKES_DAMAGE; // damage from spikes weaponCheck: { - MTEHatchInputBus inputbus = this.mInputBusses.size() == 0 ? null : this.mInputBusses.get(0); + MTEHatchInputBus inputbus = this.mInputBusses.isEmpty() ? null : this.mInputBusses.get(0); if (inputbus != null && !inputbus.isValid()) inputbus = null; ItemStack lootingHolder = inputbus == null ? null : inputbus.getStackInSlot(0); if (lootingHolder == null) break weaponCheck; @@ -592,7 +589,6 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme EECPlayer.currentWeapon = weapon; Item lootingHolderItem = weapon.getItem(); for (int i = 0; i < times + 1; i++) { - // noinspection ConstantConditions if (!lootingHolderItem.hitEntity(weapon, recipe.recipe.entity, EECPlayer)) break; if (weapon.stackSize == 0) { weaponCache.setStackInSlot(0, null); @@ -656,9 +652,8 @@ public class MTEExtremeEntityCrusher extends KubaTechGTMultiBlockBase<MTEExtreme mCasing = 0; if (!checkPiece(STRUCTURE_PIECE_MAIN, 2, 6, 0)) return false; if (mCasing < 35 || mMaintenanceHatches.size() != 1 - || mEnergyHatches.size() == 0 - || !(mInputBusses.size() == 0 || (mInputBusses.size() == 1 && mInputBusses.get(0).mTier == 0))) - return false; + || mEnergyHatches.isEmpty() + || !(mInputBusses.isEmpty() || (mInputBusses.size() == 1 && mInputBusses.get(0).mTier == 0))) return false; if (mGlassTier < 8) for (MTEHatchEnergy hatch : mEnergyHatches) if (hatch.mTier > mGlassTier) return false; if (isInRitualMode) connectToRitual(); return true; |