mirror of
https://github.com/GTNewHorizons/Draconic-Evolution.git
synced 2026-10-26 14:24:14 +00:00
Don't block gregtech ores on AOE safe mode
This commit is contained in:
1 parent
e65bfc1ea6
commit
21981128ac
3 files changed
+16
-2
No files matched your search
+1
-1
@@ -1,5 +1,5 @@
|
||||
minecraft_version=1.7.10
|
||||
mod_version=1.0.2k
|
||||
mod_version=1.0.2l
|
||||
forge_version=10.13.4.1614-1.7.10
|
||||
CCLIB_version=1.1.3.140
|
||||
NEI_version=1.0.5.120
|
||||
|
||||
+5
-1
@@ -13,6 +13,8 @@ import com.brandon3055.draconicevolution.common.lib.References;
|
||||
import com.brandon3055.draconicevolution.common.utills.IConfigurableItem;
|
||||
import com.brandon3055.draconicevolution.common.utills.IUpgradableItem;
|
||||
import com.brandon3055.draconicevolution.common.utills.ItemConfigField;
|
||||
import com.brandon3055.draconicevolution.integration.ModHelper;
|
||||
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.MaterialLiquid;
|
||||
import net.minecraft.client.Minecraft;
|
||||
@@ -27,6 +29,7 @@ import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.network.play.client.C07PacketPlayerDigging;
|
||||
import net.minecraft.network.play.server.S18PacketEntityTeleport;
|
||||
import net.minecraft.network.play.server.S23PacketBlockChange;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.ChatComponentTranslation;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
@@ -160,7 +163,8 @@ public abstract class MiningTool extends ToolBase implements IUpgradableItem {
|
||||
for (int xPos = x - xMin; xPos <= x + xMax; xPos++) {
|
||||
for (int yPos = y + yOffset - yMin; yPos <= y + yOffset + yMax; yPos++) {
|
||||
for (int zPos = z - zMin; zPos <= z + zMax; zPos++) {
|
||||
if (player.worldObj.getTileEntity(xPos, yPos, zPos) != null) {
|
||||
TileEntity te = player.worldObj.getTileEntity(xPos, yPos, zPos);
|
||||
if (te != null && !ModHelper.isGregTechTileEntityOre(te)) {
|
||||
if (player.worldObj.isRemote) {
|
||||
player.addChatComponentMessage(new ChatComponentTranslation("msg.de.baseSafeAOW.txt"));
|
||||
} else
|
||||
|
||||
@@ -3,8 +3,10 @@ package com.brandon3055.draconicevolution.integration;
|
||||
import com.brandon3055.draconicevolution.common.items.armor.CustomArmorHandler.ArmorSummery;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import cpw.mods.fml.common.registry.GameRegistry;
|
||||
import gregtech.common.blocks.GT_TileEntity_Ores;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.tileentity.TileEntity;
|
||||
import net.minecraftforge.event.entity.living.LivingAttackEvent;
|
||||
|
||||
/**
|
||||
@@ -15,6 +17,7 @@ public class ModHelper {
|
||||
public static boolean isTConInstalled;
|
||||
public static boolean isAvaritiaInstalled;
|
||||
public static boolean isRotaryCraftInstalled;
|
||||
public static boolean isGregTechInstalled;
|
||||
private static Item cleaver;
|
||||
private static Item avaritiaSword;
|
||||
private static Item bedrockSword;
|
||||
@@ -23,6 +26,7 @@ public class ModHelper {
|
||||
isTConInstalled = Loader.isModLoaded("TConstruct");
|
||||
isAvaritiaInstalled = Loader.isModLoaded("Avaritia");
|
||||
isRotaryCraftInstalled = Loader.isModLoaded("RotaryCraft");
|
||||
isGregTechInstalled = Loader.isModLoaded("gregtech");
|
||||
}
|
||||
|
||||
public static boolean isHoldingCleaver(EntityPlayer player) {
|
||||
@@ -78,4 +82,10 @@ public class ModHelper {
|
||||
return event.ammount;
|
||||
}
|
||||
|
||||
public static boolean isGregTechTileEntityOre(TileEntity te) {
|
||||
if (!isGregTechInstalled) return false;
|
||||
else if (te instanceof gregtech.common.blocks.GT_TileEntity_Ores) return true;
|
||||
else return false;
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user