diff options
| author | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-11-03 19:25:29 +0100 |
|---|---|---|
| committer | bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com> | 2019-11-03 19:25:29 +0100 |
| commit | 87304c5f763e328fdc447d9c9d2cf9d7779b0658 (patch) | |
| tree | 33100f1531e2039f97d16706c97769ba70d67a4d /src/main/java/com/detrav/items/behaviours | |
| parent | f04832f47680f4a164d242e02389f04813075a78 (diff) | |
| download | GT5-Unofficial-87304c5f763e328fdc447d9c9d2cf9d7779b0658.tar.gz GT5-Unofficial-87304c5f763e328fdc447d9c9d2cf9d7779b0658.tar.bz2 GT5-Unofficial-87304c5f763e328fdc447d9c9d2cf9d7779b0658.zip | |
fixed small ores showing up on non-small ore screen
+autogenerated a color for every registered fluid
+version increase
Signed-off-by: bartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>
Diffstat (limited to 'src/main/java/com/detrav/items/behaviours')
| -rw-r--r-- | src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java | 2 | ||||
| -rw-r--r-- | src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index c614a844f6..46c01af8ee 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -115,6 +115,8 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi 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; 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)); diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java index 4a8655360f..297266819b 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java @@ -221,7 +221,9 @@ public class BehaviourDetravToolProPick extends Behaviour_None { if (!name.isEmpty()) addOreToHashMap(name, aPlayer); } else if (Loader.isModLoaded("bartworks") && BartWorksHelper.isOre(tBlock)){ - addOreToHashMap(GT_LanguageManager.getTranslation("bw.blockores.01." + ((BartWorksHelper.getMetaFromBlock(aChunk,x,y,z,tBlock))*-1) + ".name"), aPlayer); + 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"))) { |