diff options
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java | 17 | ||||
| -rw-r--r-- | src/main/java/com/detrav/net/DetravProPickPacket00.java | 12 |
2 files changed, 16 insertions, 13 deletions
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index 8b8732a848..9704a8f582 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -35,7 +35,7 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi super(aCosts); } - public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { + public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { if (!aWorld.isRemote) { int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue(); @@ -113,9 +113,18 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi } } } - else if (tBlock instanceof BlockBaseOre) { - packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, new Short((short) (7000+(short) ((BlockBaseOre) tBlock).getMaterialEx().calculateProtons()))); - } + else if (tBlock instanceof BlockBaseOre) { + short num=0; + for (byte n=0;n<gtPlusPlus.core.material.ORES.class.getFields().length;++n) + try { + if (gtPlusPlus.core.material.ORES.class.getFields()[n].get(gtPlusPlus.core.material.ORES.class.getFields()[n]).equals(((BlockBaseOre) tBlock).getMaterialEx())) { + num = n; + break; + } + } catch (Exception e) {} + + packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, (short) (7000+num)); + } else if (data == 1) { ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { diff --git a/src/main/java/com/detrav/net/DetravProPickPacket00.java b/src/main/java/com/detrav/net/DetravProPickPacket00.java index 583e2b58a6..d7f90b39e8 100644 --- a/src/main/java/com/detrav/net/DetravProPickPacket00.java +++ b/src/main/java/com/detrav/net/DetravProPickPacket00.java @@ -140,22 +140,16 @@ public class DetravProPickPacket00 extends DetravPacket { Materials tMaterial = null; gtPlusPlus.core.material.Material pMaterial = null; try { - if (meta>10000 || meta<7000) { + if (meta<7000||meta>7500) { tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000]; } else { short l = (short) (meta-7000); - for (Field g : gtPlusPlus.core.material.ORES.class.getFields()) { - if (g.get(g) instanceof gtPlusPlus.core.material.Material) { - gtPlusPlus.core.material.Material p = (Material) g.get(g); - if ((short)p.calculateProtons() == l) - pMaterial = p; - } - } + pMaterial = (Material) gtPlusPlus.core.material.ORES.class.getFields()[l].get(gtPlusPlus.core.material.ORES.class.getFields()[l]); } } catch (Exception e) { tMaterial = null; } - if (meta>10000 || meta<7000) { + if (meta<7000||meta>7500) { if (tMaterial == null) { exception++; continue; |