From 8ecc28d1317e01036a6d0f1cefa34b0aacd2d16a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 24 Jan 2021 00:37:23 -0800 Subject: Selectable ores on electronic prospector * Cleaned up some class/file names * Removed unused code/comments * Cached other mods being loaded * Various optimizations --- .../detrav/items/DetravMetaGeneratedTool01.java | 354 ++++----------------- .../BehaviourDetravToolElectricProPick.java | 210 ------------ .../BehaviourDetravToolElectricProspector.java | 195 ++++++++++++ .../behaviours/BehaviourDetravToolProPick.java | 40 +-- .../processing/ProcessingDetravToolProPick.java | 52 --- .../processing/ProcessingDetravToolProspector.java | 49 +++ .../java/com/detrav/items/tools/DetravProPick.java | 37 --- .../com/detrav/items/tools/DetravProspector.java | 33 ++ .../items/tools/DetravToolElectricProPick.java | 34 -- .../items/tools/DetravToolElectricProPickBase.java | 189 ----------- .../items/tools/DetravToolElectricProspector.java | 34 ++ .../tools/DetravToolElectricProspectorBase.java | 189 +++++++++++ 12 files changed, 583 insertions(+), 833 deletions(-) delete mode 100644 src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java create mode 100644 src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java delete mode 100644 src/main/java/com/detrav/items/processing/ProcessingDetravToolProPick.java create mode 100644 src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java delete mode 100644 src/main/java/com/detrav/items/tools/DetravProPick.java create mode 100644 src/main/java/com/detrav/items/tools/DetravProspector.java delete mode 100644 src/main/java/com/detrav/items/tools/DetravToolElectricProPick.java delete mode 100644 src/main/java/com/detrav/items/tools/DetravToolElectricProPickBase.java create mode 100644 src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java create mode 100644 src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java (limited to 'src/main/java/com/detrav/items') diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java index 7144454b16..6e3e0bef71 100644 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java +++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java @@ -4,10 +4,9 @@ import java.util.List; import com.detrav.DetravScannerMod; import com.detrav.enums.DetravToolDictNames; -import com.detrav.items.tools.DetravProPick; -import com.detrav.items.tools.DetravToolElectricProPick; +import com.detrav.items.tools.DetravProspector; +import com.detrav.items.tools.DetravToolElectricProspector; -import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.Materials; import gregtech.api.enums.TC_Aspects; @@ -20,9 +19,6 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidStack; - -import static com.detrav.DetravScannerMod.DEBUGBUILD; /** * Created by wital_000 on 19.03.2016. @@ -33,137 +29,58 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { public DetravMetaGeneratedTool01() { super("detrav.metatool.01"); INSTANCE = this; - addTool(0,"Prospector's Scanner(ULV)","", new DetravProPick(0), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); - addTool(2,"Prospector's Scanner(LV)","", new DetravProPick(1), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); - addTool(4,"Prospector's Scanner(MV)","", new DetravProPick(2), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); - addTool(6,"Prospector's Scanner(HV)","", new DetravProPick(3), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); - addTool(8,"Prospector's Scanner(EV)","", new DetravProPick(4), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); - addTool(10,"Prospector's Scanner(IV)","", new DetravProPick(5), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); - addTool(12,"Prospector's Scanner(LuV)","", new DetravProPick(6), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); - addTool(14,"Prospector's Scanner(ZPM)","", new DetravProPick(7), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); - addTool(16,"Prospector's Scanner(UV)","", new DetravProPick(8), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); - addTool(18,"Prospector's Scanner(UHV)","", new DetravProPick(9), new Object[]{DetravToolDictNames.craftingToolProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); - - addTool(100, "Electric Prospector's Scanner (LuV)", "", new DetravToolElectricProPick(6), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); - addTool(102, "Electric Prospector's Scanner (ZPM)", "", new DetravToolElectricProPick(7), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); - addTool(104, "Electric Prospector's Scanner (UV)", "", new DetravToolElectricProPick(8), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); - addTool(106, "Electric Prospector's Scanner (UHV)", "", new DetravToolElectricProPick(9), new Object[]{DetravToolDictNames.craftingToolElectricProPick, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); + addTool(0, "Prospector's Scanner(ULV)", "", new DetravProspector(0), new Object[]{DetravToolDictNames.craftingToolProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); + addTool(2, "Prospector's Scanner(LV)", "", new DetravProspector(1), new Object[]{DetravToolDictNames.craftingToolProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); + addTool(4, "Prospector's Scanner(MV)", "", new DetravProspector(2), new Object[]{DetravToolDictNames.craftingToolProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); + addTool(6, "Prospector's Scanner(HV)", "", new DetravProspector(3), new Object[]{DetravToolDictNames.craftingToolProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); + addTool(8, "Prospector's Scanner(EV)", "", new DetravProspector(4), new Object[]{DetravToolDictNames.craftingToolProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); + addTool(10, "Prospector's Scanner(IV)", "", new DetravProspector(5), new Object[]{DetravToolDictNames.craftingToolProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); + addTool(12, "Prospector's Scanner(LuV)", "", new DetravProspector(6), new Object[]{DetravToolDictNames.craftingToolProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); + addTool(14, "Prospector's Scanner(ZPM)", "", new DetravProspector(7), new Object[]{DetravToolDictNames.craftingToolProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); + addTool(16, "Prospector's Scanner(UV)", "", new DetravProspector(8), new Object[]{DetravToolDictNames.craftingToolProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); + addTool(18, "Prospector's Scanner(UHV)", "", new DetravProspector(9), new Object[]{DetravToolDictNames.craftingToolProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.PERFODIO, 4L)); + + addTool(100, "Electric Prospector's Scanner (LuV)", "", new DetravToolElectricProspector(6), new Object[]{DetravToolDictNames.craftingToolElectricProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); + addTool(102, "Electric Prospector's Scanner (ZPM)", "", new DetravToolElectricProspector(7), new Object[]{DetravToolDictNames.craftingToolElectricProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); + addTool(104, "Electric Prospector's Scanner (UV)", "", new DetravToolElectricProspector(8), new Object[]{DetravToolDictNames.craftingToolElectricProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); + addTool(106, "Electric Prospector's Scanner (UHV)", "", new DetravToolElectricProspector(9), new Object[]{DetravToolDictNames.craftingToolElectricProspector, new TC_Aspects.TC_AspectStack(TC_Aspects.INSTRUMENTUM, 2L), new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 4L)}, new TC_Aspects.TC_AspectStack(TC_Aspects.ELECTRUM, 4L)); setCreativeTab(DetravScannerMod.TAB_DETRAV); } + @SuppressWarnings("unchecked") public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) { - //getElectricStats() - //super.addAdditionalToolTips(); long tMaxDamage = getToolMaxDamage(aStack); Materials tMaterial = getPrimaryMaterial(aStack); IToolStats tStats = getToolStats(aStack); int tOffset = aList.size(); - //getElectricStats(aStack) != null ? 2 : 1; - if (tStats != null) { - String name = aStack.getUnlocalizedName(); - String num = name.substring("gt.detrav.metatool.01.".length()); - int meta = Integer.parseInt(num); - int range = getHarvestLevel(aStack, "")/2+(meta/4); - if ((range % 2) == 0 ) { - range += 1; - } - if (meta<100) { - aList.add(tOffset + 0, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.durability") + EnumChatFormatting.GREEN + Long.toString(tMaxDamage - getToolDamage(aStack)) + " / " + Long.toString(tMaxDamage) + EnumChatFormatting.GRAY); - aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.getLocalizedNameForItem("%material") + EnumChatFormatting.GRAY); - aList.add(tOffset + 2, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.range") + - Integer.toString(range) + - "x"+ - Integer.toString(range) + - EnumChatFormatting.GRAY); - aList.add(tOffset + 3, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.0") + EnumChatFormatting.GRAY); - aList.add(tOffset + 4, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.1") + EnumChatFormatting.GRAY); - aList.add(tOffset + 5, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.success.chance")+EnumChatFormatting.RESET+Integer.toString(((((1+meta)*8) <= 100)? ((1+meta)*8) : 100))+EnumChatFormatting.GRAY+"%"); - aList.add(tOffset + 6, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.distance.0")); - aList.add(tOffset + 7, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.distance.1")); - - /*aList.add(tOffset + 4, "Traces: 1-9"); - aList.add(tOffset + 5, "Small: 10-29"); - aList.add(tOffset + 6, "Medium: 30-59"); - aList.add(tOffset + 7, "Large: 60-99"); - aList.add(tOffset + 8, "Very large: 100-***");*/ - }else if (meta >=100 && meta<200) { - aList.add(tOffset + 0, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.durability") + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); - aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.getLocalizedNameForItem("%material") + EnumChatFormatting.GRAY); - aList.add(tOffset + 2, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.range") + EnumChatFormatting.YELLOW + (getHarvestLevel(aStack, "") * 2 + 1) + "x" + (getHarvestLevel(aStack, "") * 2 + 1) + EnumChatFormatting.GRAY); - aList.add(tOffset + 3, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.0")); - aList.add(tOffset + 4, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.1")); - aList.add(tOffset + 5, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.2")); - } - - /* unused - case 106: - case 107: - aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Loss/Tick EU: " + EnumChatFormatting.GREEN + getElectricStatsLoss(aStack) + EnumChatFormatting.GRAY); - aList.add(tOffset + 1, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); - aList.add(tOffset + 2, "Can use as normal battery"); - aList.add(tOffset + 3, "x4 charge speed for tools"); - aList.add(tOffset + 4, "Right click to open GUI"); - break; - case 108: - aList.add(tOffset + 0, EnumChatFormatting.WHITE + "It can configure any programmed circuit" + EnumChatFormatting.GRAY); - break; - case 200: - int count; - count = ((int)(getLevel(aStack,0)*100)); if(count > 0) {aList.add(tOffset, "Bonus 0 level: +" + count + "%");tOffset++;} - count = ((int)(getLevel(aStack,1)*100)); if(count > 0) {aList.add(tOffset, "Bonus 1 level: +" + count + "%");tOffset++;} - count = ((int)(getLevel(aStack,2)*100)); if(count > 0) {aList.add(tOffset, "Bonus 2 level: +" + count + "%");tOffset++;} - count = ((int)(getLevel(aStack,3)*100)); if(count > 0) {aList.add(tOffset, "Bonus 3 level: +" + count + "%");tOffset++;} - count = ((int)(getLevel(aStack,4)*100)); if(count > 0) {aList.add(tOffset, "Bonus 4 level: +" + count + "%");tOffset++;} - count = ((int)(getLevel(aStack,5)*100)); if(count > 0) {aList.add(tOffset, "Bonus 5 level: +" + count + "%");tOffset++;} - count = ((int)(getLevel(aStack,6)*100)); if(count > 0) {aList.add(tOffset, "Bonus 6 level: +" + count + "%");tOffset++;} - count = ((int)(getLevel(aStack,7)*100)); if(count > 0) {aList.add(tOffset, "Bonus 7 level: +" + count + "%");tOffset++;} - count = ((int)(getLevel(aStack,8)*100)); if(count > 0) {aList.add(tOffset, "Bonus 8 level: +" + count + "%");tOffset++;} - break; - case 220: - aList.add(tOffset + 0, EnumChatFormatting.WHITE + "Durability: " + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); - aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.mDefaultLocalName + EnumChatFormatting.YELLOW + " lvl " + getHarvestLevel(aStack, "") + EnumChatFormatting.GRAY); - aList.add(tOffset + 2, "It can suck in fluid"); - FluidStack stack = getFluidStackFromDetravData(aStack); - if(stack!=null && stack.amount >0) - { - aList.add(tOffset +3, "Fluid: "+stack.getLocalizedName()+" : "+stack.amount); - } - else - { - aList.add(tOffset +3, "Fluid: empty"); - } - break; - - } - */ + if (tStats == null) return; + + String name = aStack.getUnlocalizedName(); + String num = name.substring("gt.detrav.metatool.01.".length()); + int meta = Integer.parseInt(num); + int range = getHarvestLevel(aStack, "")/2+(meta/4); + if ((range % 2) == 0 ) { + range += 1; } - } - - public Long getElectricStatsLoss(ItemStack aStack) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("GT.ToolStats"); - if (aNBT != null && aNBT.getBoolean("Electric")) - return aNBT.getLong("Loss"); + if (meta<100) { + aList.add(tOffset + 0, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.durability") + EnumChatFormatting.GREEN + Long.toString(tMaxDamage - getToolDamage(aStack)) + " / " + Long.toString(tMaxDamage) + EnumChatFormatting.GRAY); + aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.getLocalizedNameForItem("%material") + EnumChatFormatting.GRAY); + aList.add(tOffset + 2, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.range") + Integer.toString(range) + "x"+ Integer.toString(range) + EnumChatFormatting.GRAY); + aList.add(tOffset + 3, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.0") + EnumChatFormatting.GRAY); + aList.add(tOffset + 4, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.1") + EnumChatFormatting.GRAY); + aList.add(tOffset + 5, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.success.chance")+EnumChatFormatting.RESET+Integer.toString(((((1+meta)*8) <= 100)? ((1+meta)*8) : 100))+EnumChatFormatting.GRAY+"%"); + aList.add(tOffset + 6, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.distance.0")); + aList.add(tOffset + 7, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.distance.1")); + + } else if (meta >=100 && meta<200) { + aList.add(tOffset + 0, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.durability") + EnumChatFormatting.GREEN + (tMaxDamage - getToolDamage(aStack)) + " / " + tMaxDamage + EnumChatFormatting.GRAY); + aList.add(tOffset + 1, EnumChatFormatting.WHITE + tMaterial.getLocalizedNameForItem("%material") + EnumChatFormatting.GRAY); + aList.add(tOffset + 2, EnumChatFormatting.WHITE + StatCollector.translateToLocal("tooltip.detrav.scanner.range") + EnumChatFormatting.YELLOW + (getHarvestLevel(aStack, "") * 2 + 1) + "x" + (getHarvestLevel(aStack, "") * 2 + 1) + EnumChatFormatting.GRAY); + aList.add(tOffset + 3, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.0")); + aList.add(tOffset + 4, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.1")); + aList.add(tOffset + 5, EnumChatFormatting.ITALIC+ StatCollector.translateToLocal("tooltip.detrav.scanner.usage.2")); } - return 0L; - } - - public final ItemStack getToolWithStatsPlus(int aToolID, int aAmount, Materials aPrimaryMaterial, Materials aSecondaryMaterial, long[] aElectricArray, long aLoss) { - return getToolWithStatsPlus(aToolID, aAmount, aPrimaryMaterial, aSecondaryMaterial, aElectricArray, aLoss, 10000L); - } - public final ItemStack getToolWithStatsPlus(int aToolID, int aAmount, Materials aPrimaryMaterial, Materials aSecondaryMaterial, long[] aElectricArray, long aLoss, long durability) { - ItemStack result = getToolWithStats(aToolID, aAmount, aPrimaryMaterial, aSecondaryMaterial, aElectricArray); - NBTTagCompound aNBT = result.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("GT.ToolStats"); - if (aNBT != null && aNBT.getBoolean("Electric")) { - aNBT.setLong("Loss", aLoss); - } - aNBT.setLong("MaxDamage", durability); - } - return result; } public Long getToolGTDetravData(ItemStack aStack) { @@ -188,183 +105,52 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { return false; } - public void setLevelToItemStack(ItemStack aStack, int level, float percent) - { - if(aStack == null) return; - NBTTagCompound aNBT = aStack.getTagCompound(); - if(aNBT == null) { - aNBT = new NBTTagCompound(); - NBTTagCompound detravLevel = new NBTTagCompound(); - aNBT.setTag("DetravLevel", detravLevel); - aStack.setTagCompound(aNBT); - } - { - NBTTagCompound detravLevel = aNBT.getCompoundTag("DetravLevel"); - if (detravLevel == null || hasnolevel(detravLevel)) { - detravLevel = new NBTTagCompound(); - aNBT.setTag("DetravLevel", detravLevel); - } - detravLevel.setFloat("level"+Integer.toString(level),percent); - } - } - - - private boolean hasnolevel(NBTTagCompound detravLevel) - { - for(int i=0;i<9;i++) - { - if(detravLevel.hasKey("level"+Integer.toString(i))) - return false; - } - return true; - } - - public float getLevel(ItemStack aStack, int level) - { - if(aStack == null) return 0; - NBTTagCompound aNBT = aStack.getTagCompound(); - if(aNBT ==null) return 0; - NBTTagCompound detravLevel = aNBT.getCompoundTag("DetravLevel"); - if(detravLevel == null) return 0; - return detravLevel.getFloat("level"+Integer.toString(level)); - } - - public boolean setItemStackToDetravData(ItemStack aStack, ItemStack what) - { - if(aStack == null) return false; - NBTTagCompound aNBT = aStack.getTagCompound(); - if(aNBT == null) { - aNBT = new NBTTagCompound(); - NBTTagCompound detravData = new NBTTagCompound(); - aNBT.setTag("DetravData", detravData); - aStack.setTagCompound(aNBT); - } - { - NBTTagCompound detravData = aNBT.getCompoundTag("DetravData"); - if (detravData == null || detravData.getShort("id") == 0) { - detravData = new NBTTagCompound(); - aNBT.setTag("DetravData", detravData); - } - if (what == null) - aNBT.removeTag("DetravData"); - else - what.writeToNBT(detravData); - return true; - } - } - - public ItemStack getItemStackFromDetravData(ItemStack aStack) - { - if(aStack == null) return null; - NBTTagCompound aNBT = aStack.getTagCompound(); - if(aNBT ==null) return null; - NBTTagCompound detravData = aNBT.getCompoundTag("DetravData"); - if(detravData == null) return null; - return ItemStack.loadItemStackFromNBT(detravData); - } - - - public boolean setFluidStackToDetravData(ItemStack aStack, FluidStack what) - { - if(aStack == null) return false; - NBTTagCompound aNBT = aStack.getTagCompound(); - if(aNBT == null) { - aNBT = new NBTTagCompound(); - NBTTagCompound detravData = new NBTTagCompound(); - aNBT.setTag("DetravData", detravData); - aStack.setTagCompound(aNBT); - } - { - NBTTagCompound detravData = aNBT.getCompoundTag("DetravData"); - if (detravData == null || detravData.getShort("id") == 0) { - detravData = new NBTTagCompound(); - aNBT.setTag("DetravData", detravData); - } - if (what == null) - aNBT.removeTag("DetravData"); - else - what.writeToNBT(detravData); - return true; - } - } - - public FluidStack getFluidStackFromDetravData(ItemStack aStack) - { - if(aStack == null) return null; - NBTTagCompound aNBT = aStack.getTagCompound(); - if(aNBT ==null) return null; - NBTTagCompound detravData = aNBT.getCompoundTag("DetravData"); - if(detravData == null) return null; - return FluidStack.loadFluidStackFromNBT(detravData); - } - - //SubItems TODO + @SuppressWarnings("unchecked") public void getDetravSubItems(Item item, CreativeTabs detravCreativeTab, List list) { ItemStack dStack; - if (Loader.isModLoaded("dreamcraft")) { + if (DetravScannerMod.isDreamcraftLoaded) { //Materials at tiers - dStack = getToolWithStats(0, 1, Materials.Polycaprolactam, Materials.Polycaprolactam, null); - list.add(dStack); - dStack = getToolWithStats(2, 1, Materials.Steel, Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(2, 1, Materials.Bronze, Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(4, 1, Materials.Manyullyn, Materials.Aluminium, null); - list.add(dStack); - dStack = getToolWithStats(6, 1, Materials.DamascusSteel, Materials.DamascusSteel, null); - list.add(dStack); - dStack = getToolWithStats(8, 1, Materials.Titanium, Materials.Titanium, null); - list.add(dStack); - dStack = getToolWithStats(10, 1, Materials.TungstenSteel, Materials.TungstenSteel, null); - list.add(dStack); - dStack = getToolWithStats(12, 1, Materials.Iridium, Materials.Iridium, null); - list.add(dStack); - dStack = getToolWithStats(12, 1, Materials.Osmium, Materials.Osmium, null); - list.add(dStack); - dStack = getToolWithStats(14, 1, Materials.Neutronium, Materials.Neutronium, null); - list.add(dStack); - - dStack = getToolWithStats(16, 1, Materials.InfinityCatalyst, Materials.InfinityCatalyst, null); - list.add(dStack); - dStack = getToolWithStats(18, 1, Materials.Infinity, Materials.Infinity, null); - list.add(dStack); + list.add(getToolWithStats(0, 1, Materials.Polycaprolactam, Materials.Polycaprolactam, null)); + list.add(getToolWithStats(2, 1, Materials.Steel, Materials.Steel, null)); + list.add(getToolWithStats(2, 1, Materials.Bronze, Materials.Steel, null)); + list.add(getToolWithStats(4, 1, Materials.Manyullyn, Materials.Aluminium, null)); + list.add(getToolWithStats(6, 1, Materials.DamascusSteel, Materials.DamascusSteel, null)); + list.add(getToolWithStats(8, 1, Materials.Titanium, Materials.Titanium, null)); + list.add(getToolWithStats(10, 1, Materials.TungstenSteel, Materials.TungstenSteel, null)); + list.add(getToolWithStats(12, 1, Materials.Iridium, Materials.Iridium, null)); + list.add(getToolWithStats(12, 1, Materials.Osmium, Materials.Osmium, null)); + list.add(getToolWithStats(14, 1, Materials.Neutronium, Materials.Neutronium, null)); + list.add(getToolWithStats(16, 1, Materials.InfinityCatalyst, Materials.InfinityCatalyst, null)); + list.add(getToolWithStats(18, 1, Materials.Infinity, Materials.Infinity, null)); } //Steel for comparison - dStack = getToolWithStats(0,1,Materials.Steel,Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(2,1,Materials.Steel,Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(4,1,Materials.Steel,Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(6,1,Materials.Steel,Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(8,1,Materials.Steel,Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(10,1,Materials.Steel,Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(12,1,Materials.Steel,Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(14,1,Materials.Steel,Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(16,1,Materials.Steel,Materials.Steel, null); - list.add(dStack); - dStack = getToolWithStats(18,1,Materials.Steel,Materials.Steel, null); - list.add(dStack); + list.add(getToolWithStats(0,1,Materials.Steel,Materials.Steel, null)); + list.add(getToolWithStats(2,1,Materials.Steel,Materials.Steel, null)); + list.add(getToolWithStats(4,1,Materials.Steel,Materials.Steel, null)); + list.add(getToolWithStats(6,1,Materials.Steel,Materials.Steel, null)); + list.add(getToolWithStats(8,1,Materials.Steel,Materials.Steel, null)); + list.add(getToolWithStats(10,1,Materials.Steel,Materials.Steel, null)); + list.add(getToolWithStats(12,1,Materials.Steel,Materials.Steel, null)); + list.add(getToolWithStats(14,1,Materials.Steel,Materials.Steel, null)); + list.add(getToolWithStats(16,1,Materials.Steel,Materials.Steel, null)); + list.add(getToolWithStats(18,1,Materials.Steel,Materials.Steel, null)); //Electric Scanners dStack = getToolWithStats(100, 1, Materials.Iridium, Materials.TungstenSteel, new long[]{102400000L, GT_Values.V[6], 6L, -1L}); setCharge(dStack,102400000L); list.add(dStack); + dStack = getToolWithStats(102, 1, Materials.Neutronium, Materials.TungstenSteel, new long[]{409600000L, GT_Values.V[7], 7L, -1L}); setCharge(dStack,409600000L); list.add(dStack); - if (Loader.isModLoaded("dreamcraft")) { + if (DetravScannerMod.isDreamcraftLoaded) { dStack = getToolWithStats(104, 1, Materials.InfinityCatalyst, Materials.TungstenSteel, new long[]{1638400000L, GT_Values.V[8], 8L, -1L}); setCharge(dStack, 1638400000L); list.add(dStack); + dStack = getToolWithStats(106, 1, Materials.Infinity, Materials.TungstenSteel, new long[]{6553600000L, GT_Values.V[9], 9L, -1L}); setCharge(dStack, 6553600000L); list.add(dStack); diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java deleted file mode 100644 index fecec059dc..0000000000 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ /dev/null @@ -1,210 +0,0 @@ -package com.detrav.items.behaviours; - -import com.detrav.items.DetravMetaGeneratedTool01; -import com.detrav.net.DetravNetwork; -import com.detrav.net.DetravProPickPacket00; -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; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.common.GT_UndergroundOil; -import gregtech.common.blocks.GT_Block_Ores_Abstract; -import gregtech.common.blocks.GT_TileEntity_Ores; -import net.minecraft.block.Block; -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; -import net.minecraft.util.ChatComponentText; -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; - -/** - * Created by wital_000 on 19.03.2016. - */ -public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPick { - - public BehaviourDetravToolElectricProPick(int aCosts) { - super(aCosts); - } - - public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { - if (!aWorld.isRemote) { - int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue(); - if (aPlayer.isSneaking()) { - data++; - if (data > 3) data = 0; - switch (data) { - case 0: - aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.0"))); - break; - case 1: - aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.1"))); - break; - case 2: - aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.2"))); - break; - case 3: - aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.3"))); - break; - default: - aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.error"))); - break; - } - DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, (long) data); - 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; - int size = aItem.getHarvestLevel(aStack, "") + 1; - List chunks = new ArrayList(); - //aPlayer.addChatMessage(new ChatComponentText("Scanning Begin, wait!")); - //DetravProPickPacket00 packet = new DetravProPickPacket00(); - 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"); - 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); - for (int y = 1; y < ySize; y++) { - switch (data) { - case 0: - case 1: - 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) { - 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; - 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; - 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; - 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)); - if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { - packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, (short) tAssotiation.mMaterial.mMaterial.mMetaItemSubID); - } - } - break; - case 2: - if ((x == 0) || (z == 0)) { //Skip doing the locations with the grid on them. - break; - } - 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()); - } - break; - case 3: - float polution = (float) getPolution(aWorld, c.xPosition * 16 + x, c.zPosition * 16 + z); - polution /= 2000000; - polution *= -0xFF; - if (polution > 0xFF) - polution = 0xFF; - polution = 0xFF - polution; - packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) polution); - break; - } - if (data > 1) - break; - } - } - } - packet.level = ((DetravMetaGeneratedTool01) aItem).getHarvestLevel(aStack, ""); - DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer); - if (!aPlayer.capabilities.isCreativeMode) - tool.doDamage(aStack, this.mCosts * chunks.size()); - } - return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); - } - - void addChatMassageByValue(EntityPlayer aPlayer, int value, String name) { - if (value < 0) { - aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name)); - } else if (value < 1) { - aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6"))); - } else - aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name + " " + value)); - } - - public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { - long data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack); - if (data < 2) { - if(aWorld.getBlock(aX,aY,aZ) == Blocks.bedrock) - { - if (!aWorld.isRemote) { - FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1); - addChatMassageByValue(aPlayer,fStack.amount,fStack.getLocalizedName()); - if (!aPlayer.capabilities.isCreativeMode) - ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, this.mCosts); - } - 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) { - FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1); - addChatMassageByValue(aPlayer, fStack.amount, fStack.getLocalizedName()); - if (!aPlayer.capabilities.isCreativeMode) - ((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts); - return true; - } - if (!aWorld.isRemote) { - int polution = getPolution(aWorld, aX, aZ); - addChatMassageByValue(aPlayer, polution, "Pollution"); - } - return true; - } - -} diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java new file mode 100644 index 0000000000..bb26d09476 --- /dev/null +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java @@ -0,0 +1,195 @@ +package com.detrav.items.behaviours; + +import com.detrav.DetravScannerMod; +import com.detrav.items.DetravMetaGeneratedTool01; +import com.detrav.net.DetravNetwork; +import com.detrav.net.ProspectingPacket; +import com.detrav.utils.BartWorksHelper; +import com.detrav.utils.GTppHelper; +import gregtech.api.items.GT_MetaBase_Item; +import gregtech.api.objects.ItemData; +import gregtech.api.util.GT_LanguageManager; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.common.GT_UndergroundOil; +import gregtech.common.blocks.GT_Block_Ores_Abstract; +import gregtech.common.blocks.GT_TileEntity_Ores; +import net.minecraft.block.Block; +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; +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 java.util.ArrayList; +import java.util.List; + +/** + * Created by wital_000 on 19.03.2016. + */ +public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolProPick { + + public BehaviourDetravToolElectricProspector(int aCosts) { + super(aCosts); + } + + public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { + if (!aWorld.isRemote) { + int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue(); + if (aPlayer.isSneaking()) { + data++; + if (data > 3) data = 0; + switch (data) { + case 0: + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.0"))); + break; + case 1: + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.1"))); + break; + case 2: + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.2"))); + break; + case 3: + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.3"))); + break; + default: + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.error"))); + break; + } + DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, (long) data); + return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); + } + + 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; + final List 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; + + 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++) { + final int ySize = c.getHeightValue(x, z); + for (int y = 1; y < ySize; y++) { + switch (data) { + case 0: + case 1: + 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 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 (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 (data != 1 && name.contains(".small.")) continue; + packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, tMetaID); + } + } + } 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)); + if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { + packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, (short) tAssotiation.mMaterial.mMaterial.mMetaItemSubID); + } + } + break; + case 2: + if ((x == 0) || (z == 0)) { //Skip doing the locations with the grid on them. + break; + } + 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, 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: + float polution = (float) getPolution(aWorld, c.xPosition * 16 + x, c.zPosition * 16 + z); + polution /= 2000000; + polution *= -0xFF; + if (polution > 0xFF) + polution = 0xFF; + polution = 0xFF - polution; + packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) polution); + break; + } + if (data > 1) + break; + } + } + } + packet.level = ((DetravMetaGeneratedTool01) aItem).getHarvestLevel(aStack, ""); + DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer); + if (!aPlayer.capabilities.isCreativeMode) + tool.doDamage(aStack, this.mCosts * chunks.size()); + } + return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); + } + + void addChatMassageByValue(EntityPlayer aPlayer, int value, String name) { + if (value < 0) { + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name)); + } else if (value < 1) { + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6"))); + } else + aPlayer.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name + " " + value)); + } + + public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { + long data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack); + if (data < 2) { + if(aWorld.getBlock(aX,aY,aZ) == Blocks.bedrock) + { + if (!aWorld.isRemote) { + FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1); + addChatMassageByValue(aPlayer,fStack.amount,fStack.getLocalizedName()); + if (!aPlayer.capabilities.isCreativeMode) + ((DetravMetaGeneratedTool01)aItem).doDamage(aStack, this.mCosts); + } + return true; + } + else { + if (!aWorld.isRemote) { + prospectSingleChunk( (DetravMetaGeneratedTool01) aItem, aStack, aPlayer, aWorld, aX, aY, aZ ); + } + return true; + } + } + if (data < 3) + if (!aWorld.isRemote) { + FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1); + addChatMassageByValue(aPlayer, fStack.amount, fStack.getLocalizedName()); + if (!aPlayer.capabilities.isCreativeMode) + ((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts); + return true; + } + if (!aWorld.isRemote) { + int polution = getPolution(aWorld, aX, aZ); + addChatMassageByValue(aPlayer, polution, "Pollution"); + } + return true; + } + +} diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java index 19cbe655f5..800e5336d4 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProPick.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; @@ -37,12 +36,7 @@ import java.util.SplittableRandom; */ public class BehaviourDetravToolProPick 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 ores; @@ -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) @@ -172,6 +164,7 @@ public class BehaviourDetravToolProPick extends Behaviour_None { } }else if (aRandom.nextInt(100) < chance) { 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) - { - - } +