aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com/detrav/items/behaviours
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com/detrav/items/behaviours')
-rw-r--r--src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java (renamed from src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java)65
-rw-r--r--src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java (renamed from src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java)50
2 files changed, 43 insertions, 72 deletions
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
index fecec059dc..36f35fb35b 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java
@@ -1,11 +1,11 @@
package com.detrav.items.behaviours;
+import com.detrav.DetravScannerMod;
import com.detrav.items.DetravMetaGeneratedTool01;
import com.detrav.net.DetravNetwork;
-import com.detrav.net.DetravProPickPacket00;
+import com.detrav.net.ProspectingPacket;
import com.detrav.utils.BartWorksHelper;
import com.detrav.utils.GTppHelper;
-import cpw.mods.fml.common.Loader;
import gregtech.api.items.GT_MetaBase_Item;
import gregtech.api.objects.ItemData;
import gregtech.api.util.GT_LanguageManager;
@@ -20,10 +20,10 @@ import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.fluids.FluidStack;
-import net.minecraft.util.StatCollector;
import java.util.ArrayList;
import java.util.List;
@@ -31,9 +31,9 @@ import java.util.List;
/**
* Created by wital_000 on 19.03.2016.
*/
-public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPick {
+public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolProspector {
- public BehaviourDetravToolElectricProPick(int aCosts) {
+ public BehaviourDetravToolElectricProspector(int aCosts) {
super(aCosts);
}
@@ -64,61 +64,49 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
return super.onItemRightClick(aItem, aStack, aWorld, aPlayer);
}
- //aPlayer.openGui();
- DetravMetaGeneratedTool01 tool = (DetravMetaGeneratedTool01) aItem;
- //aWorld.getChunkFromBlockCoords()
- int cX = ((int) aPlayer.posX) >> 4;
- int cZ = ((int) aPlayer.posZ) >> 4;
+ final DetravMetaGeneratedTool01 tool = (DetravMetaGeneratedTool01) aItem;
+ final int cX = ((int) aPlayer.posX) >> 4;
+ final int cZ = ((int) aPlayer.posZ) >> 4;
int size = aItem.getHarvestLevel(aStack, "") + 1;
- List<Chunk> chunks = new ArrayList<Chunk>();
- //aPlayer.addChatMessage(new ChatComponentText("Scanning Begin, wait!"));
- //DetravProPickPacket00 packet = new DetravProPickPacket00();
+ final List<Chunk> chunks = new ArrayList<>();
+ aPlayer.addChatMessage(new ChatComponentText("Scanning..."));
+
for (int i = -size; i <= size; i++)
for (int j = -size; j <= size; j++)
if (i != -size && i != size && j != -size && j != size)
chunks.add(aWorld.getChunkFromChunkCoords(cX + i, cZ + j));
size = size - 1;
- //c.gene
- DetravProPickPacket00 packet = new DetravProPickPacket00();
- packet.ptype = (int) data;
- packet.chunkX = cX;
- packet.chunkZ = cZ;
- packet.size = size;
- String small_ore_keyword = StatCollector.translateToLocal("detrav.scanner.small_ore.keyword");
+
+ final ProspectingPacket packet = new ProspectingPacket(cX, cZ, (int) aPlayer.posX, (int) aPlayer.posZ, size, data);
+ final String small_ore_keyword = StatCollector.translateToLocal("detrav.scanner.small_ore.keyword");
for (Chunk c : chunks) {
for (int x = 0; x < 16; x++)
for (int z = 0; z < 16; z++) {
- int ySize = c.getHeightValue(x, z);//(int)aPlayer.posY;//c.getHeightValue(x, z);
+ final int ySize = c.getHeightValue(x, z);
for (int y = 1; y < ySize; y++) {
switch (data) {
case 0:
case 1:
- Block tBlock = c.getBlock(x, y, z);
+ final Block tBlock = c.getBlock(x, y, z);
short tMetaID = (short) c.getBlockMetadata(x, y, z);
if (tBlock instanceof GT_Block_Ores_Abstract) {
TileEntity tTileEntity = c.getTileEntityUnsafe(x, y, z);
- if ((tTileEntity != null)
- && (tTileEntity instanceof GT_TileEntity_Ores)
- && ((GT_TileEntity_Ores) tTileEntity).mNatural == true) {
+ if ((tTileEntity instanceof GT_TileEntity_Ores) && ((GT_TileEntity_Ores) tTileEntity).mNatural) {
tMetaID = (short) ((GT_TileEntity_Ores) tTileEntity).getMetaData();
try {
-
- String name = GT_LanguageManager.getTranslation(
- tBlock.getUnlocalizedName() + "." + tMetaID + ".name");
- if (name.startsWith(small_ore_keyword)) if (data != 1) continue;
+ String name = GT_LanguageManager.getTranslation(tBlock.getUnlocalizedName() + "." + tMetaID + ".name");
+ if (data != 1 && name.startsWith(small_ore_keyword)) continue;
packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, tMetaID);
} catch (Exception e) {
String name = tBlock.getUnlocalizedName() + ".";
- if (name.contains(".small.")) if (data != 1) continue;
+ if (data != 1 && name.contains(".small.")) continue;
packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, tMetaID);
}
}
- } else if (Loader.isModLoaded("miscutils") && GTppHelper.isGTppBlock(tBlock)) {
- short meta = GTppHelper.getGTppMeta(tBlock);
- packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, meta);
- } else if (Loader.isModLoaded("bartworks") && BartWorksHelper.isOre(tBlock)) {
- if (data != 1 && BartWorksHelper.isSmallOre(tBlock))
- continue;
+ } else if (DetravScannerMod.isGTppLoaded && GTppHelper.isGTppBlock(tBlock)) {
+ packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, GTppHelper.getGTppMeta(tBlock));
+ } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)) {
+ if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue;
packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, BartWorksHelper.getMetaFromBlock(c, x, y, z, tBlock));
} else if (data == 1) {
ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
@@ -133,8 +121,8 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
}
FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(c.xPosition * 16 + x, c.zPosition * 16 + z), -1);
if (fStack.amount > 0) {
- packet.addBlock(c.xPosition * 16 + x, 2, c.zPosition * 16 + z, (short) fStack.amount);
packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) fStack.getFluidID());
+ packet.addBlock(c.xPosition * 16 + x, 2, c.zPosition * 16 + z, (short) fStack.amount);
}
break;
case 3:
@@ -183,14 +171,11 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
return true;
}
else {
- //if (aWorld.getBlock(aX, aY, aZ).getMaterial() == Material.rock || aWorld.getBlock(aX, aY, aZ) == GregTech_API.sBlockOres1) {
if (!aWorld.isRemote) {
prospectSingleChunk( (DetravMetaGeneratedTool01) aItem, aStack, aPlayer, aWorld, aX, aY, aZ );
}
return true;
}
- //}
- //return false;
}
if (data < 3)
if (!aWorld.isRemote) {
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java
index 19cbe655f5..a2961f5689 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java
@@ -4,7 +4,6 @@ import com.detrav.DetravScannerMod;
import com.detrav.items.DetravMetaGeneratedTool01;
import com.detrav.utils.BartWorksHelper;
import com.detrav.utils.GTppHelper;
-import cpw.mods.fml.common.Loader;
import gregtech.api.GregTech_API;
import gregtech.api.enums.Materials;
import gregtech.api.items.GT_MetaBase_Item;
@@ -35,14 +34,9 @@ import java.util.SplittableRandom;
/**
* Created by wital_000 on 19.03.2016.
*/
-public class BehaviourDetravToolProPick extends Behaviour_None {
+public class BehaviourDetravToolProspector extends Behaviour_None {
- static final int[] DISTANCEINTS = new int[] {
- 0,
- 4,
- 25,
- 64,
- };
+ static final int[] DISTANCEINTS = new int[] {0, 4, 25, 64};
int distTextIndex;
HashMap<String, Integer> ores;
@@ -50,7 +44,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
protected final int mCosts;
- public BehaviourDetravToolProPick(int aCosts) {
+ public BehaviourDetravToolProspector(int aCosts) {
mCosts = aCosts;
}
@@ -92,7 +86,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
int bZ = aZ;
badluck = 0;
- ores = new HashMap<String, Integer>();
+ ores = new HashMap<>();
int range = ((DetravMetaGeneratedTool01)aItem).getHarvestLevel(aStack, "")/2+(aStack.getItemDamage()/4);
if ((range % 2) == 0 ) {
@@ -134,7 +128,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
// Used by Electric scanner when scanning the chunk whacked by the scanner. 100% chance find rate
protected void prospectSingleChunk(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ )
{
- ores = new HashMap<String, Integer>();
+ ores = new HashMap<>();
aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.GOLD+ StatCollector.translateToLocal("detrav.scanner.prospecting") + EnumChatFormatting.BLUE + "(" + aX + ", " + aZ + ")" ));
processOreProspecting((DetravMetaGeneratedTool01) aItem, aStack, aPlayer, aWorld.getChunkFromBlockCoords(aX, aZ), aWorld.getTileEntity(aX, aY, aZ),GT_OreDictUnificator.getAssociation(new ItemStack(aWorld.getBlock(aX, aY, aZ), 1, aWorld.getBlockMetadata(aX, aY, aZ))), new SplittableRandom(), 1000);
@@ -157,9 +151,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
return;
}
} else if (tAssotiation!=null){
- //if (aTileEntity instanceof GT_TileEntity_Ores) {
try {
- GT_TileEntity_Ores gt_entity = (GT_TileEntity_Ores) aTileEntity;
String name = tAssotiation.toString();
addChatMassageByValue(aPlayer, -1, name);
if (!aPlayer.capabilities.isCreativeMode)
@@ -171,7 +163,8 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
addChatMassageByValue(aPlayer, -1, "ERROR, lol ^_^");
}
}else if (aRandom.nextInt(100) < chance) {
- int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue();
+ final int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue();
+ final String small_ore_keyword = StatCollector.translateToLocal("detrav.scanner.small_ore.keyword");
for (int x = 0; x < 16; x++)
for (int z = 0; z < 16; z++) {
int ySize = aChunk.getHeightValue(x, z);
@@ -181,30 +174,27 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
short tMetaID = (short)aChunk.getBlockMetadata(x,y,z);
if (tBlock instanceof GT_Block_Ores_Abstract) {
TileEntity tTileEntity = aChunk.getTileEntityUnsafe(x,y,z);
- if ((tTileEntity!=null)
- && (tTileEntity instanceof GT_TileEntity_Ores)
- && ((GT_TileEntity_Ores) tTileEntity).mNatural == true) {
+ if ((tTileEntity instanceof GT_TileEntity_Ores)
+ && ((GT_TileEntity_Ores) tTileEntity).mNatural) {
tMetaID = (short)((GT_TileEntity_Ores) tTileEntity).getMetaData();
try {
- String name = Materials.getLocalizedNameForItem(
- GT_LanguageManager.getTranslation(tBlock.getUnlocalizedName() + "." + tMetaID + ".name"), tMetaID%1000);
- if (name.startsWith(StatCollector.translateToLocal("detrav.scanner.small_ore.keyword"))) if (data != 1) continue;
+ String name = Materials.getLocalizedNameForItem(GT_LanguageManager.getTranslation(tBlock.getUnlocalizedName() + "." + tMetaID + ".name"), tMetaID%1000);
+ if (data != 1 && name.startsWith(small_ore_keyword)) continue;
addOreToHashMap(name, aPlayer);
}
catch(Exception e) {
String name = tBlock.getUnlocalizedName() + ".";
- if (name.contains(".small.")) if (data != 1) continue;
+ if (data != 1 && name.contains(".small.")) continue;
addOreToHashMap(name, aPlayer);
}
}
- } else if (Loader.isModLoaded("miscutils") && GTppHelper.isGTppBlock(tBlock) ) {
+ } else if (DetravScannerMod.isGTppLoaded && GTppHelper.isGTppBlock(tBlock) ) {
String name = GTppHelper.getGTppVeinName(tBlock);
if (!name.isEmpty())
addOreToHashMap(name, aPlayer);
- } else if (Loader.isModLoaded("bartworks") && BartWorksHelper.isOre(tBlock)){
- if (data != 1 && BartWorksHelper.isSmallOre(tBlock))
- continue;
- addOreToHashMap(GT_LanguageManager.getTranslation((BartWorksHelper.isSmallOre(tBlock) ? "bw.blockores.02." : "bw.blockores.01.") + ((BartWorksHelper.getMetaFromBlock(aChunk,x,y,z,tBlock))*-1) + ".name"), aPlayer);
+ } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)){
+ if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue;
+ addOreToHashMap(GT_LanguageManager.getTranslation((BartWorksHelper.isSmallOre(tBlock) ? "bw.blockores.02." : "bw.blockores.01.") + ((BartWorksHelper.getMetaFromBlock(aChunk,x,y,z,tBlock))*-1) + ".name"), aPlayer);
} else if (data == 1) {
tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) {
@@ -212,18 +202,14 @@ public class BehaviourDetravToolProPick extends Behaviour_None {
try {
tMetaID = (short)tAssotiation.mMaterial.mMaterial.mMetaItemSubID;
- String name = Materials.getLocalizedNameForItem(GT_LanguageManager.getTranslation(
- "gt.blockores." + tMetaID + ".name"), tMetaID%1000);
+ String name = Materials.getLocalizedNameForItem(GT_LanguageManager.getTranslation("gt.blockores." + tMetaID + ".name"), tMetaID%1000);
addOreToHashMap(name, aPlayer);
} catch (Exception e1) {
String name = tAssotiation.toString();
addOreToHashMap(name, aPlayer);
}
}
- catch (Exception e)
- {
-
- }
+ catch (Exception ignored) { }
}
}
generated by cgit (git 2.46.0) at 2025-03-10 05:31:21 +0000