diff options
| -rw-r--r-- | build.gradle | 6 | ||||
| -rw-r--r-- | build.properties | 1 | ||||
| -rw-r--r-- | src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java | 17 | ||||
| -rw-r--r-- | src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java | 30 |
4 files changed, 49 insertions, 5 deletions
diff --git a/build.gradle b/build.gradle index 8e7fae74e6..ebaff278de 100644 --- a/build.gradle +++ b/build.gradle @@ -69,6 +69,9 @@ repositories { maven { // AppleCore url "http://www.ryanliptak.com/maven/" } + maven { + url = "https://jitpack.io" + } } dependencies { @@ -82,6 +85,9 @@ dependencies { provided ("com.enderio:EnderIO:${config.enderio.version}:dev") { transitive = false } + compileOnly("com.github.SinTh0r4s:VisualProspecting:${config.visualprospecting.version}") { + transitive = false + } } task devJar(type: Jar) { from sourceSets.main.output diff --git a/build.properties b/build.properties index b259be1bcc..db2f5cf210 100644 --- a/build.properties +++ b/build.properties @@ -22,3 +22,4 @@ railcraft.cf=2219/321 railcraft.version=1.7.10-9.4.0.0 nc.cf=2275/987 nc.version=2.3.4a +visualprospecting.version=1.0.14b diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java index 36f35fb35b..edde4d77bd 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java @@ -6,6 +6,8 @@ import com.detrav.net.DetravNetwork; import com.detrav.net.ProspectingPacket; import com.detrav.utils.BartWorksHelper; import com.detrav.utils.GTppHelper; +import com.sinthoras.visualprospecting.VisualProspecting_API; +import cpw.mods.fml.common.Loader; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.objects.ItemData; import gregtech.api.util.GT_LanguageManager; @@ -144,6 +146,21 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer); if (!aPlayer.capabilities.isCreativeMode) tool.doDamage(aStack, this.mCosts * chunks.size()); + + if(Loader.isModLoaded("visualprospecting")) { + if(data == 0 || data == 1) { + VisualProspecting_API.LogicalServer.sendProspectionResultsToClient( + (EntityPlayerMP) aPlayer, + VisualProspecting_API.LogicalServer.prospectOreVeinsWithinRadius(aWorld.provider.dimensionId, (int) aPlayer.posX, (int) aPlayer.posZ, size * 16), + new ArrayList<>()); + } + else if(data == 2) { + VisualProspecting_API.LogicalServer.sendProspectionResultsToClient( + (EntityPlayerMP) aPlayer, + new ArrayList<>(), + VisualProspecting_API.LogicalServer.prospectUndergroundFluidsWithingRadius(aWorld, (int) aPlayer.posX, (int) aPlayer.posZ, size * 16)); + } + } } return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); } diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java index 7b87da7b50..65a2f9e80e 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java @@ -4,6 +4,8 @@ import com.detrav.DetravScannerMod; import com.detrav.items.DetravMetaGeneratedTool01; import com.detrav.utils.BartWorksHelper; import com.detrav.utils.GTppHelper; +import com.sinthoras.visualprospecting.VisualProspecting_API; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.LanguageRegistry; import gregtech.api.GregTech_API; import gregtech.api.enums.Materials; @@ -19,6 +21,7 @@ import gregtech.common.items.behaviors.Behaviour_None; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.init.Blocks; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; @@ -29,11 +32,7 @@ import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; import net.minecraftforge.fluids.FluidStack; -import java.util.List; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.SplittableRandom; +import java.util.*; /** * Created by wital_000 on 19.03.2016. @@ -74,6 +73,13 @@ public class BehaviourDetravToolProspector extends Behaviour_None { aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED+"You found no liquid."));*/ if (!aPlayer.capabilities.isCreativeMode) ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, this.mCosts); + + if(Loader.isModLoaded("visualprospecting")) { + VisualProspecting_API.LogicalServer.sendProspectionResultsToClient( + (EntityPlayerMP) aPlayer, + new ArrayList<>(), + VisualProspecting_API.LogicalServer.prospectUndergroundFluidsWithingRadius(aWorld, (int) aPlayer.posX, (int) aPlayer.posZ, 0)); + } } return true; } @@ -163,6 +169,13 @@ public class BehaviourDetravToolProspector extends Behaviour_None { for(ChatComponentText msg : oreMessagesSorted) { aPlayer.addChatMessage(msg); } + + if(Loader.isModLoaded("visualprospecting")) { + VisualProspecting_API.LogicalServer.sendProspectionResultsToClient( + (EntityPlayerMP) aPlayer, + VisualProspecting_API.LogicalServer.prospectOreVeinsWithinRadius(aWorld.provider.dimensionId, (int) aPlayer.posX, (int) aPlayer.posZ, range * 16 ), + new ArrayList<>()); + } } // Used by Electric scanner when scanning the chunk whacked by the scanner. 100% chance find rate @@ -176,6 +189,13 @@ public class BehaviourDetravToolProspector extends Behaviour_None { int value = ores.get(key); addChatMassageByValue(aPlayer,value,key); } + + if(Loader.isModLoaded("visualprospecting")) { + VisualProspecting_API.LogicalServer.sendProspectionResultsToClient( + (EntityPlayerMP) aPlayer, + VisualProspecting_API.LogicalServer.prospectOreVeinsWithinRadius(aWorld.provider.dimensionId, (int) aPlayer.posX, (int) aPlayer.posZ, 0), + new ArrayList<>()); + } } protected void processOreProspecting(DetravMetaGeneratedTool01 aItem, ItemStack aStack, EntityPlayer aPlayer, Chunk aChunk, TileEntity aTileEntity, ItemData tAssotiation, SplittableRandom aRandom, int chance)//TileEntity aTileEntity) |