diff options
Diffstat (limited to 'src/main/java')
17 files changed, 621 insertions, 547 deletions
diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java index 152b9fbc71..99a9d9eab1 100644 --- a/src/main/java/com/detrav/DetravScannerMod.java +++ b/src/main/java/com/detrav/DetravScannerMod.java @@ -21,9 +21,9 @@ import gregtech.GT_Version; import gregtech.api.GregTech_API; @Mod( - modid = DetravScannerMod.MODID, - version = GT_Version.VERSION, - dependencies = "required-after:IC2;required-after:gregtech;after:miscutils;after:bartworks") + modid = DetravScannerMod.MODID, + version = GT_Version.VERSION, + dependencies = "required-after:IC2;required-after:gregtech;after:miscutils;after:bartworks") public class DetravScannerMod { public static final String MODID = "detravscannermod"; diff --git a/src/main/java/com/detrav/commands/DetravScannerCommand.java b/src/main/java/com/detrav/commands/DetravScannerCommand.java index ba16e47a6c..decb661cb0 100644 --- a/src/main/java/com/detrav/commands/DetravScannerCommand.java +++ b/src/main/java/com/detrav/commands/DetravScannerCommand.java @@ -88,7 +88,8 @@ public class DetravScannerCommand implements ICommand { } private void process(ICommandSender sender, int aX, int aZ, String fName) { - Chunk c = sender.getEntityWorld().getChunkFromChunkCoords(aX, aZ); + Chunk c = sender.getEntityWorld() + .getChunkFromChunkCoords(aX, aZ); if (c == null) sender.addChatMessage(new ChatComponentText("ERROR")); HashMap<String, Integer> ores = new HashMap<>(); for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) { @@ -101,10 +102,11 @@ public class DetravScannerCommand implements ICommand { GT_TileEntity_Ores gt_entity = (GT_TileEntity_Ores) entity; short meta = gt_entity.getMetaData(); String name = Materials.getLocalizedNameForItem( - GT_LanguageManager.getTranslation(b.getUnlocalizedName() + "." + meta + ".name"), - meta % 1000); + GT_LanguageManager.getTranslation(b.getUnlocalizedName() + "." + meta + ".name"), + meta % 1000); if (name.startsWith("Small")) continue; - if (fName == null || name.toLowerCase().contains(fName)) { + if (fName == null || name.toLowerCase() + .contains(fName)) { if (!ores.containsKey(name)) ores.put(name, 1); else { int val = ores.get(name); diff --git a/src/main/java/com/detrav/enums/Textures01.java b/src/main/java/com/detrav/enums/Textures01.java index cc65d4d1ca..865d30e724 100644 --- a/src/main/java/com/detrav/enums/Textures01.java +++ b/src/main/java/com/detrav/enums/Textures01.java @@ -9,9 +9,9 @@ import gregtech.api.interfaces.IIconContainer; public class Textures01 { public static final IIconContainer[] mTextures = new IIconContainer[] { - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/PRO_PICK_HEAD"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD"), - new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_UHV_PRO_PICK_HEAD"), }; + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/PRO_PICK_HEAD"), + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_LuV_PRO_PICK_HEAD"), + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_ZPM_PRO_PICK_HEAD"), + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_UV_PRO_PICK_HEAD"), + new Textures.ItemIcons.CustomIcon("gt.detrav.metatool.01/ELECTRIC_UHV_PRO_PICK_HEAD"), }; } diff --git a/src/main/java/com/detrav/events/DetravLoginEventHandler.java b/src/main/java/com/detrav/events/DetravLoginEventHandler.java index 5178516267..f8e6fe31b4 100644 --- a/src/main/java/com/detrav/events/DetravLoginEventHandler.java +++ b/src/main/java/com/detrav/events/DetravLoginEventHandler.java @@ -16,7 +16,9 @@ public class DetravLoginEventHandler { inited = true; DetravLoginEventHandler handler = new DetravLoginEventHandler(); MinecraftForge.EVENT_BUS.register(handler); - FMLCommonHandler.instance().bus().register(handler); + FMLCommonHandler.instance() + .bus() + .register(handler); } } } diff --git a/src/main/java/com/detrav/gui/DetravScannerGUI.java b/src/main/java/com/detrav/gui/DetravScannerGUI.java index c0a7e7f16f..14f3742c90 100644 --- a/src/main/java/com/detrav/gui/DetravScannerGUI.java +++ b/src/main/java/com/detrav/gui/DetravScannerGUI.java @@ -54,15 +54,15 @@ public class DetravScannerGUI extends GuiScreen { if (oresList == null || (prevW != width || prevH != height)) { oresList = new OresList( - this, - 100, - currentHeight, - aY, - aY + currentHeight, - aX + currentWidth, - 10, - map.packet.ores, - ((name, invert) -> { if (map != null) map.loadTexture(null, name, invert); })); + this, + 100, + currentHeight, + aY, + aY + currentHeight, + aX + currentWidth, + 10, + map.packet.ores, + ((name, invert) -> { if (map != null) map.loadTexture(null, name, invert); })); prevW = width; prevH = height; } @@ -72,7 +72,8 @@ public class DetravScannerGUI extends GuiScreen { map.glBindTexture(); map.draw(aX, aY); oresList.drawScreen(x, y, f); - mc.getTextureManager().bindTexture(back); + mc.getTextureManager() + .bindTexture(back); GL11.glColor4f(0xFF, 0xFF, 0xFF, 0xFF); // draw corners @@ -102,12 +103,12 @@ public class DetravScannerGUI extends GuiScreen { short fluidAmount = fluidInfo[tX][tY].get((byte) 2); if (fluidId != 0 && fluidAmount > 0) { info.add( - StatCollector.translateToLocal("gui.detrav.scanner.tooltip.fluid_name") - + map.packet.metaMap.get(fluidId)); + StatCollector.translateToLocal("gui.detrav.scanner.tooltip.fluid_name") + + map.packet.metaMap.get(fluidId)); info.add( - StatCollector.translateToLocal("gui.detrav.scanner.tooltip.fluid_amount") - + GT_Utility.formatNumbers(fluidAmount) - + " L"); + StatCollector.translateToLocal("gui.detrav.scanner.tooltip.fluid_amount") + + GT_Utility.formatNumbers(fluidAmount) + + " L"); } else info.add(StatCollector.translateToLocal("gui.detrav.scanner.tooltip.no_fluid")); } else { info.add(StatCollector.translateToLocal("gui.detrav.scanner.tooltip.no_fluid")); diff --git a/src/main/java/com/detrav/gui/OresList.java b/src/main/java/com/detrav/gui/OresList.java index 54c2152f5a..cc8f9b1baa 100644 --- a/src/main/java/com/detrav/gui/OresList.java +++ b/src/main/java/com/detrav/gui/OresList.java @@ -22,7 +22,7 @@ class OresList extends GuiScrollingList { private int selected = -1; public OresList(GuiScreen parent, int width, int height, int top, int bottom, int left, int entryHeight, - HashMap<String, Integer> aOres, BiConsumer<String, Boolean> onSelected) { + HashMap<String, Integer> aOres, BiConsumer<String, Boolean> onSelected) { super(parent.mc, width, height, top, bottom, left, entryHeight); this.parent = parent; this.onSelected = onSelected; @@ -57,10 +57,10 @@ class OresList extends GuiScrollingList { @Override protected void drawSlot(int slotIdx, int entryRight, int slotTop, int slotBuffer, Tessellator tess) { parent.drawString( - parent.mc.fontRenderer, - parent.mc.fontRenderer.trimStringToWidth(keys.get(slotIdx), listWidth - 10), - this.left + 3, - slotTop - 1, - ores.getOrDefault(keys.get(slotIdx), 0x7d7b76)); + parent.mc.fontRenderer, + parent.mc.fontRenderer.trimStringToWidth(keys.get(slotIdx), listWidth - 10), + this.left + 3, + slotTop - 1, + ores.getOrDefault(keys.get(slotIdx), 0x7d7b76)); } } diff --git a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java index 01c570d5a1..1659b9bffc 100644 --- a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java +++ b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java @@ -51,14 +51,14 @@ public class DetravMapTexture extends AbstractTexture { } } else if (packet.ptype == 2) { final short fluidId = packet.map[i][j].get((byte) 1), - fluidSize = packet.map[i][j].get((byte) 2); + fluidSize = packet.map[i][j].get((byte) 2); final String name = packet.metaMap.get(fluidId); // Variables used to locate within a chunk. final int k = (i % 16), l = (j % 16); if (((k + l * 16) * 3) < (fluidSize + 48) - && (selected.equals("All") || selected.equals(name))) { + && (selected.equals("All") || selected.equals(name))) { image.setRGB(i, j, packet.ores.getOrDefault(name, Color.BLACK.getRGB()) | 0XFF000000); } } else if (packet.ptype == 3) { @@ -120,29 +120,25 @@ public class DetravMapTexture extends AbstractTexture { Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertexWithUV( - (double) (x), - (double) (y + height), - 0, - (double) ((float) (u) * f), - (double) ((float) (v + height) * f1)); + (double) (x), + (double) (y + height), + 0, + (double) ((float) (u) * f), + (double) ((float) (v + height) * f1)); tessellator.addVertexWithUV( - (double) (x + width), - (double) (y + height), - 0, - (double) ((float) (u + width) * f), - (double) ((float) (v + height) * f1)); + (double) (x + width), + (double) (y + height), + 0, + (double) ((float) (u + width) * f), + (double) ((float) (v + height) * f1)); tessellator.addVertexWithUV( - (double) (x + width), - (double) (y), - 0, - (double) ((float) (u + width) * f), - (double) ((float) (v) * f1)); - tessellator.addVertexWithUV( - (double) (x), - (double) (y), - 0, - (double) ((float) (u) * f), - (double) ((float) (v) * f1)); + (double) (x + width), + (double) (y), + 0, + (double) ((float) (u + width) * f), + (double) ((float) (v) * f1)); + tessellator + .addVertexWithUV((double) (x), (double) (y), 0, (double) ((float) (u) * f), (double) ((float) (v) * f1)); tessellator.draw(); } diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java index c5b891784e..2aa01f4fab 100644 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java +++ b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java @@ -32,132 +32,132 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { super("detrav.metatool.01"); INSTANCE = this; addTool( - 0, - "Prospector's Scanner(ULV)", - "", - new DetravProspector(0), - DetravToolDictNames.craftingToolProspector.toString(), - 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)); + 0, + "Prospector's Scanner(ULV)", + "", + new DetravProspector(0), + DetravToolDictNames.craftingToolProspector.toString(), + 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), - DetravToolDictNames.craftingToolProspector.toString(), - 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)); + 2, + "Prospector's Scanner(LV)", + "", + new DetravProspector(1), + DetravToolDictNames.craftingToolProspector.toString(), + 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), - DetravToolDictNames.craftingToolProspector.toString(), - 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)); + 4, + "Prospector's Scanner(MV)", + "", + new DetravProspector(2), + DetravToolDictNames.craftingToolProspector.toString(), + 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), - DetravToolDictNames.craftingToolProspector.toString(), - 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)); + 6, + "Prospector's Scanner(HV)", + "", + new DetravProspector(3), + DetravToolDictNames.craftingToolProspector.toString(), + 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), - DetravToolDictNames.craftingToolProspector.toString(), - 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)); + 8, + "Prospector's Scanner(EV)", + "", + new DetravProspector(4), + DetravToolDictNames.craftingToolProspector.toString(), + 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), - DetravToolDictNames.craftingToolProspector.toString(), - 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)); + 10, + "Prospector's Scanner(IV)", + "", + new DetravProspector(5), + DetravToolDictNames.craftingToolProspector.toString(), + 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), - DetravToolDictNames.craftingToolProspector.toString(), - 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)); + 12, + "Prospector's Scanner(LuV)", + "", + new DetravProspector(6), + DetravToolDictNames.craftingToolProspector.toString(), + 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), - DetravToolDictNames.craftingToolProspector.toString(), - 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)); + 14, + "Prospector's Scanner(ZPM)", + "", + new DetravProspector(7), + DetravToolDictNames.craftingToolProspector.toString(), + 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), - DetravToolDictNames.craftingToolProspector.toString(), - 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)); + 16, + "Prospector's Scanner(UV)", + "", + new DetravProspector(8), + DetravToolDictNames.craftingToolProspector.toString(), + 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), - DetravToolDictNames.craftingToolProspector.toString(), - 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)); + 18, + "Prospector's Scanner(UHV)", + "", + new DetravProspector(9), + DetravToolDictNames.craftingToolProspector.toString(), + 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), - 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)); + 100, + "Electric Prospector's Scanner (LuV)", + "", + new DetravToolElectricProspector(6), + 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), - 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)); + 102, + "Electric Prospector's Scanner (ZPM)", + "", + new DetravToolElectricProspector(7), + 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), - 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)); + 104, + "Electric Prospector's Scanner (UV)", + "", + new DetravToolElectricProspector(8), + 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), - 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)); + 106, + "Electric Prospector's Scanner (UHV)", + "", + new DetravToolElectricProspector(9), + 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); } @@ -178,82 +178,80 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { } 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); + 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); + 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); + 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); + 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); + 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 - + "%"); + 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")); + tOffset + 6, + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.distance.0")); aList.add( - tOffset + 7, - EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.distance.1")); + 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); + 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); + 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); + 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")); + tOffset + 3, + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.0")); aList.add( - tOffset + 4, - EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.1")); + tOffset + 4, + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.1")); aList.add( - tOffset + 5, - EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.2")); + tOffset + 5, + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.2")); aList.add( - tOffset + 6, - EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.3")); + tOffset + 6, + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.3")); aList.add( - tOffset + 7, - EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.4")); + tOffset + 7, + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.4")); } } @@ -313,48 +311,48 @@ public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { // Electric Scanners dStack = getToolWithStats( - 100, - 1, - Materials.Iridium, - Materials.TungstenSteel, - new long[] { 102400000L, GT_Values.V[6], 6L, -1L }); + 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 }); + 102, + 1, + Materials.Neutronium, + Materials.TungstenSteel, + new long[] { 409600000L, GT_Values.V[7], 7L, -1L }); setCharge(dStack, 409600000L); list.add(dStack); if (DetravScannerMod.isDreamcraftLoaded) { dStack = getToolWithStats( - 104, - 1, - Materials.InfinityCatalyst, - Materials.TungstenSteel, - new long[] { 1638400000L, GT_Values.V[8], 8L, -1L }); + 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 }); + 106, + 1, + Materials.Infinity, + Materials.TungstenSteel, + new long[] { 6553600000L, GT_Values.V[9], 9L, -1L }); setCharge(dStack, 6553600000L); list.add(dStack); } else { dStack = getToolWithStats( - 106, - 1, - Materials.Neutronium, - Materials.TungstenSteel, - new long[] { 6553600000L, GT_Values.V[9], 9L, -1L }); + 106, + 1, + Materials.Neutronium, + 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/BehaviourDetravToolElectricProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java index 8cd4e28fa4..d99a8ceec6 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java @@ -43,30 +43,31 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { if (!aWorld.isRemote) { - int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack).intValue(); + 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"))); + new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.0"))); break; case 1: aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.1"))); + new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.1"))); break; case 2: aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.2"))); + new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.2"))); break; case 3: aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.3"))); + new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.3"))); break; default: aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.error"))); + new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.error"))); break; } DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, (long) data); @@ -86,12 +87,12 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr size = size - 1; final ProspectingPacket packet = new ProspectingPacket( - cX, - cZ, - (int) aPlayer.posX, - (int) aPlayer.posZ, - size, - data); + 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++) { @@ -105,11 +106,11 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr 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) { + && ((GT_TileEntity_Ores) tTileEntity).mNatural) { tMetaID = (short) ((GT_TileEntity_Ores) tTileEntity).getMetaData(); try { - String name = GT_LanguageManager.getTranslation( - tBlock.getUnlocalizedName() + "." + tMetaID + ".name"); + 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) { @@ -120,26 +121,27 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr } } else if (DetravScannerMod.isGTppLoaded && GTppHelper.isGTppBlock(tBlock)) { packet.addBlock( - c.xPosition * 16 + x, - y, - c.zPosition * 16 + z, - GTppHelper.getGTppMeta(tBlock)); + 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)); + 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"))) { + .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); + c.xPosition * 16 + x, + y, + c.zPosition * 16 + z, + (short) tAssotiation.mMaterial.mMaterial.mMetaItemSubID); } } break; @@ -148,26 +150,23 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr break; } FluidStack fStack = GT_UndergroundOil.undergroundOil( - aWorld.getChunkFromBlockCoords(c.xPosition * 16 + x, c.zPosition * 16 + z), - -1); + 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); + 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); + aWorld, + c.xPosition * 16 + x, + c.zPosition * 16 + z); polution /= 2000000; polution *= -0xFF; if (polution > 0xFF) polution = 0xFF; @@ -186,22 +185,22 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr 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<>()); + (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)); + (EntityPlayerMP) aPlayer, + new ArrayList<>(), + VisualProspecting_API.LogicalServer.prospectUndergroundFluidsWithingRadius( + aWorld, + (int) aPlayer.posX, + (int) aPlayer.posZ, + size * 16)); } } } @@ -211,17 +210,16 @@ public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolPr void addChatMassageByValue(EntityPlayer aPlayer, int value, String name) { if (value < 0) { aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name)); + 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"))); + 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)); + 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) { + 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) { diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java index f6f6350020..66ef237593 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java @@ -61,7 +61,7 @@ public class BehaviourDetravToolProspector extends Behaviour_None { } 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) { + int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { SplittableRandom aRandom = new SplittableRandom(); int chance = ((1 + aStack.getItemDamage()) * 8) > 100 ? 100 : (1 + aStack.getItemDamage()) * 8; @@ -84,20 +84,19 @@ public class BehaviourDetravToolProspector extends Behaviour_None { if (Loader.isModLoaded("visualprospecting")) { VisualProspecting_API.LogicalServer.sendProspectionResultsToClient( - (EntityPlayerMP) aPlayer, - new ArrayList<>(), - VisualProspecting_API.LogicalServer.prospectUndergroundFluidsWithingRadius( - aWorld, - (int) aPlayer.posX, - (int) aPlayer.posZ, - 0)); + (EntityPlayerMP) aPlayer, + new ArrayList<>(), + VisualProspecting_API.LogicalServer + .prospectUndergroundFluidsWithingRadius(aWorld, (int) aPlayer.posX, (int) aPlayer.posZ, 0)); } } return true; } - if (aWorld.getBlock(aX, aY, aZ).getMaterial() == Material.rock - || aWorld.getBlock(aX, aY, aZ).getMaterial() == Material.ground - || aWorld.getBlock(aX, aY, aZ) == GregTech_API.sBlockOres1) { + if (aWorld.getBlock(aX, aY, aZ) + .getMaterial() == Material.rock + || aWorld.getBlock(aX, aY, aZ) + .getMaterial() == Material.ground + || aWorld.getBlock(aX, aY, aZ) == GregTech_API.sBlockOres1) { if (!aWorld.isRemote) { prospectChunks((DetravMetaGeneratedTool01) aItem, aStack, aPlayer, aWorld, aX, aY, aZ, aRandom, chance); } @@ -107,7 +106,7 @@ public class BehaviourDetravToolProspector extends Behaviour_None { } protected void prospectChunks(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, - int aY, int aZ, SplittableRandom aRandom, int chance) { + int aY, int aZ, SplittableRandom aRandom, int chance) { int bX = aX; int bZ = aZ; @@ -122,16 +121,10 @@ public class BehaviourDetravToolProspector extends Behaviour_None { range = range / 2; // Convert range from diameter to radius aPlayer.addChatMessage( - new ChatComponentText( - EnumChatFormatting.GOLD - + GT_LanguageManager.sEnglishFile - .get("LanguageFile", "gt.scanner.prospecting", "Prospecting at ").getString() - + EnumChatFormatting.BLUE - + "(" - + bX - + ", " - + bZ - + ")")); + new ChatComponentText( + EnumChatFormatting.GOLD + GT_LanguageManager.sEnglishFile + .get("LanguageFile", "gt.scanner.prospecting", "Prospecting at ") + .getString() + EnumChatFormatting.BLUE + "(" + bX + ", " + bZ + ")")); for (int x = -(range); x < (range + 1); ++x) { aX = bX + (x * 16); for (int z = -(range); z < (range + 1); ++z) { @@ -145,27 +138,26 @@ public class BehaviourDetravToolProspector extends Behaviour_None { } } if (DetravScannerMod.DEBUG_ENABLED) aPlayer.addChatMessage( - new ChatComponentText( - EnumChatFormatting.YELLOW + "Chunk at " - + aX - + "|" - + aZ - + " to " - + (aX + 16) - + "|" - + (aZ + 16) - + StatCollector - .translateToLocal("detrav.scanner.distance.texts." + distTextIndex))); + new ChatComponentText( + EnumChatFormatting.YELLOW + "Chunk at " + + aX + + "|" + + aZ + + " to " + + (aX + 16) + + "|" + + (aZ + 16) + + StatCollector.translateToLocal("detrav.scanner.distance.texts." + distTextIndex))); 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))), - aRandom, - chance); + (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))), + aRandom, + chance); } } @@ -179,11 +171,11 @@ public class BehaviourDetravToolProspector extends Behaviour_None { // Define sort order by distance List<String> sortOrder = Arrays.asList( - StatCollector.translateToLocal("detrav.scanner.distance.texts.4"), - StatCollector.translateToLocal("detrav.scanner.distance.texts.3"), - StatCollector.translateToLocal("detrav.scanner.distance.texts.2"), - StatCollector.translateToLocal("detrav.scanner.distance.texts.1"), - StatCollector.translateToLocal("detrav.scanner.distance.texts.0")); + StatCollector.translateToLocal("detrav.scanner.distance.texts.4"), + StatCollector.translateToLocal("detrav.scanner.distance.texts.3"), + StatCollector.translateToLocal("detrav.scanner.distance.texts.2"), + StatCollector.translateToLocal("detrav.scanner.distance.texts.1"), + StatCollector.translateToLocal("detrav.scanner.distance.texts.0")); List<ChatComponentText> oreMessagesSorted = new ArrayList<ChatComponentText>(); oreMessagesSorted.add(new ChatComponentText(CHAT_MSG_SEPARATOR)); @@ -191,27 +183,29 @@ public class BehaviourDetravToolProspector extends Behaviour_None { // Sort ore messages by distance, separated by ----- for (String oreFrequency : sortOrder) { for (ChatComponentText msg : oreMessages) { - if (msg.getChatComponentText_TextValue().contains(oreFrequency)) { + if (msg.getChatComponentText_TextValue() + .contains(oreFrequency)) { oreMessagesSorted.add(msg); } } // Only append ----- separator if text has been added - if (!oreMessagesSorted.get(oreMessagesSorted.size() - 1).getChatComponentText_TextValue() - .contains(CHAT_MSG_SEPARATOR)) { + if (!oreMessagesSorted.get(oreMessagesSorted.size() - 1) + .getChatComponentText_TextValue() + .contains(CHAT_MSG_SEPARATOR)) { oreMessagesSorted.add(new ChatComponentText(CHAT_MSG_SEPARATOR)); } } if (badluck == 0) { oreMessages.add( - new ChatComponentText( - EnumChatFormatting.WHITE + StatCollector.translateToLocal("detrav.scanner.success"))); + new ChatComponentText( + EnumChatFormatting.WHITE + StatCollector.translateToLocal("detrav.scanner.success"))); } else { oreMessages.add( - new ChatComponentText( - EnumChatFormatting.WHITE + StatCollector.translateToLocal("detrav.scanner.fail") - .replace("%badluck", Integer.toString(badluck)))); + new ChatComponentText( + EnumChatFormatting.WHITE + StatCollector.translateToLocal("detrav.scanner.fail") + .replace("%badluck", Integer.toString(badluck)))); } // Print the sorted messages @@ -221,34 +215,34 @@ public class BehaviourDetravToolProspector extends Behaviour_None { 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<>()); + (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 protected void prospectSingleChunk(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, - int aX, int aY, int aZ) { + int aX, int aY, int aZ) { ores = new HashMap<>(); aPlayer.addChatMessage( - new ChatComponentText( - EnumChatFormatting.GOLD + StatCollector.translateToLocal( - "detrav.scanner.prospecting") + EnumChatFormatting.BLUE + "(" + aX + ", " + aZ + ")")); + 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); + (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); for (String key : ores.keySet()) { int value = ores.get(key); @@ -257,25 +251,26 @@ public class BehaviourDetravToolProspector extends Behaviour_None { 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<>()); + (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) + Chunk aChunk, TileEntity aTileEntity, ItemData tAssotiation, SplittableRandom aRandom, int chance)// TileEntity + // aTileEntity) { if (aTileEntity != null) { if (aTileEntity instanceof GT_TileEntity_Ores) { GT_TileEntity_Ores gt_entity = (GT_TileEntity_Ores) aTileEntity; short meta = gt_entity.getMetaData(); - String format = LanguageRegistry.instance().getStringLocalization("gt.blockores." + meta + ".name"); + String format = LanguageRegistry.instance() + .getStringLocalization("gt.blockores." + meta + ".name"); String name = Materials.getLocalizedNameForItem(format, meta % 1000); addOreToHashMap(name, aPlayer); if (!aPlayer.capabilities.isCreativeMode) aItem.doDamage(aStack, this.mCosts); @@ -291,7 +286,8 @@ public class BehaviourDetravToolProspector extends Behaviour_None { addChatMassageByValue(aPlayer, -1, "ERROR, lol ^_^"); } } else if (aRandom.nextInt(100) < chance) { - final 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); @@ -302,11 +298,11 @@ public class BehaviourDetravToolProspector extends Behaviour_None { if (tBlock instanceof GT_Block_Ores_Abstract) { TileEntity tTileEntity = aChunk.getTileEntityUnsafe(x, y, z); if ((tTileEntity instanceof GT_TileEntity_Ores) - && ((GT_TileEntity_Ores) tTileEntity).mNatural) { + && ((GT_TileEntity_Ores) tTileEntity).mNatural) { tMetaID = (short) ((GT_TileEntity_Ores) tTileEntity).getMetaData(); try { String format = LanguageRegistry.instance() - .getStringLocalization(tBlock.getUnlocalizedName() + "." + tMetaID + ".name"); + .getStringLocalization(tBlock.getUnlocalizedName() + "." + tMetaID + ".name"); String name = Materials.getLocalizedNameForItem(format, tMetaID % 1000); if (data != 1 && name.startsWith(small_ore_keyword)) continue; addOreToHashMap(name, aPlayer); @@ -322,19 +318,20 @@ public class BehaviourDetravToolProspector extends Behaviour_None { } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)) { if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue; final Werkstoff werkstoff = Werkstoff.werkstoffHashMap.getOrDefault( - (short) ((BartWorksHelper.getMetaFromBlock(aChunk, x, y, z, tBlock)) * -1), - null); + (short) ((BartWorksHelper.getMetaFromBlock(aChunk, x, y, z, tBlock)) * -1), + null); String type = BartWorksHelper.isSmallOre(tBlock) ? "oreSmall" : "ore"; String translated = GT_LanguageManager.getTranslation("bw.blocktype." + type); addOreToHashMap(translated.replace("%material", werkstoff.getLocalizedName()), aPlayer); } else if (data == 1) { tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); - if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { + if ((tAssotiation != null) && (tAssotiation.mPrefix.toString() + .startsWith("ore"))) { try { try { tMetaID = (short) tAssotiation.mMaterial.mMaterial.mMetaItemSubID; String format = LanguageRegistry.instance() - .getStringLocalization("gt.blockores." + tMetaID + ".name"); + .getStringLocalization("gt.blockores." + tMetaID + ".name"); String name = Materials.getLocalizedNameForItem(format, tMetaID % 1000); addOreToHashMap(name, aPlayer); } catch (Exception e1) { @@ -370,8 +367,8 @@ public class BehaviourDetravToolProspector extends Behaviour_None { // the // ore if (!ores.containsKey(oreDistance)) { - if (DetravScannerMod.DEBUG_ENABLED) aPlayer.addChatMessage( - new ChatComponentText(EnumChatFormatting.GREEN + " Adding to oremap " + oreDistance)); + if (DetravScannerMod.DEBUG_ENABLED) aPlayer + .addChatMessage(new ChatComponentText(EnumChatFormatting.GREEN + " Adding to oremap " + oreDistance)); ores.put(oreDistance, 1); } else { int val = ores.get(oreDistance); @@ -382,40 +379,40 @@ public class BehaviourDetravToolProspector extends Behaviour_None { void addChatMassageByValue(EntityPlayer aPlayer, int value, String name) { if (value < 0) { aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name)); + new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name)); } else if (value < 1) { - aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.0"))); + aPlayer + .addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.0"))); } else if (value < 10) aPlayer.addChatMessage( - new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.1"))); + new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.1"))); else if (value < 30) aPlayer.addChatMessage( - new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.2"))); + new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.2"))); else if (value < 60) aPlayer.addChatMessage( - new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.3"))); + new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.3"))); else if (value < 100) aPlayer.addChatMessage( - new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.4"))); + new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.4"))); else aPlayer.addChatMessage( - new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.5"))); + new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.5"))); } // Same as addChatMassageByValue but appends to a list of chat messages and spelled correctly void appendChatMessageByValue(List<ChatComponentText> chatMessageList, EntityPlayer aPlayer, int value, - String name) { + String name) { if (value < 0) { chatMessageList - .add(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name)); + .add(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name)); } else if (value < 1) { chatMessageList.add(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.0"))); } else if (value < 10) chatMessageList - .add(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.1"))); + .add(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.1"))); else if (value < 30) chatMessageList - .add(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.2"))); + .add(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.2"))); else if (value < 60) chatMessageList - .add(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.3"))); + .add(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.3"))); else if (value < 100) chatMessageList - .add(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.4"))); + .add(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.4"))); else chatMessageList - .add(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.5"))); + .add(new ChatComponentText(name + StatCollector.translateToLocal("detrav.scanner.found.texts.5"))); } public static int getPolution(World aWorld, int aX, int aZ) { diff --git a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java index cc4bc7c081..a08103afea 100644 --- a/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java +++ b/src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java @@ -22,7 +22,7 @@ public class ProcessingDetravToolProspector implements gregtech.api.interfaces.I } public void registerOre(OrePrefixes aPrefix, Materials material, String aOreDictName, String aModName, - ItemStack aStack) { + ItemStack aStack) { if (!aPrefix.doGenerateItem(material)) return; if (DEBUG_ENABLED) return; try { @@ -32,80 +32,98 @@ public class ProcessingDetravToolProspector implements gregtech.api.interfaces.I // GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new // Object[]{"SHE","CPC","PXP",'E',OreDictionary.getOres("cellSulfuricAcid").get(0),'S',OreDictionary.getOres("cellHydroxide").get(0),'H',OrePrefixes.toolHeadDrill.get(aMaterial),'P',OrePrefixes.plate.get(aMaterial),'C',OrePrefixes.circuit.get(Materials.Primitive),'X',gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList.Sensor_ULV}); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, material, Materials.Steel, null), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellSulfuricAcid").get(0), 'S', - OreDictionary.getOres("cellHydroxide").get(0), 'H', OrePrefixes.toolHeadDrill.get(material), - 'P', OrePrefixes.plate.get(material), 'C', OrePrefixes.circuit.get(Materials.Basic), 'X', - ItemList.Sensor_LV }); + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, material, Materials.Steel, null), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellSulfuricAcid") + .get(0), 'S', + OreDictionary.getOres("cellHydroxide") + .get(0), + 'H', OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', + OrePrefixes.circuit.get(Materials.Basic), 'X', ItemList.Sensor_LV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(4, 1, material, Materials.Steel, null), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellSulfuricAcid").get(0), 'S', - OreDictionary.getOres("cellHydroxide").get(0), 'H', OrePrefixes.toolHeadDrill.get(material), - 'P', OrePrefixes.plate.get(material), 'C', OrePrefixes.circuit.get(Materials.Good), 'X', - ItemList.Sensor_MV }); + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(4, 1, material, Materials.Steel, null), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellSulfuricAcid") + .get(0), 'S', + OreDictionary.getOres("cellHydroxide") + .get(0), + 'H', OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', + OrePrefixes.circuit.get(Materials.Good), 'X', ItemList.Sensor_MV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, material, Materials.Steel, null), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellNitricAcid").get(0), 'S', - OreDictionary.getOres("cellSodiumPersulfate").get(0), 'H', - OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', - OrePrefixes.circuit.get(Materials.Advanced), 'X', ItemList.Sensor_HV }); + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(6, 1, material, Materials.Steel, null), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellNitricAcid") + .get(0), 'S', + OreDictionary.getOres("cellSodiumPersulfate") + .get(0), + 'H', OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', + OrePrefixes.circuit.get(Materials.Advanced), 'X', ItemList.Sensor_HV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(8, 1, material, Materials.Steel, null), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellNitricAcid").get(0), 'S', - OreDictionary.getOres("cellSodiumPersulfate").get(0), 'H', - OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', - OrePrefixes.circuit.get(Materials.Data), 'X', ItemList.Sensor_EV }); + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(8, 1, material, Materials.Steel, null), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellNitricAcid") + .get(0), 'S', + OreDictionary.getOres("cellSodiumPersulfate") + .get(0), + 'H', OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', + OrePrefixes.circuit.get(Materials.Data), 'X', ItemList.Sensor_EV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(10, 1, material, Materials.Steel, null), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellNitricAcid").get(0), 'S', - OreDictionary.getOres("cellSodiumPersulfate").get(0), 'H', - OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', - OrePrefixes.circuit.get(Materials.Elite), 'X', ItemList.Sensor_IV }); + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(10, 1, material, Materials.Steel, null), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellNitricAcid") + .get(0), 'S', + OreDictionary.getOres("cellSodiumPersulfate") + .get(0), + 'H', OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', + OrePrefixes.circuit.get(Materials.Elite), 'X', ItemList.Sensor_IV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(12, 1, material, Materials.Steel, null), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid").get(0), 'S', - OreDictionary.getOres("cellLithiumPeroxide").get(0), 'H', - OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', - OrePrefixes.circuit.get(Materials.Master), 'X', ItemList.Sensor_LuV }); + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(12, 1, material, Materials.Steel, null), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid") + .get(0), 'S', + OreDictionary.getOres("cellLithiumPeroxide") + .get(0), + 'H', OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', + OrePrefixes.circuit.get(Materials.Master), 'X', ItemList.Sensor_LuV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(14, 1, material, Materials.Steel, null), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid").get(0), 'S', - OreDictionary.getOres("cellLithiumPeroxide").get(0), 'H', - OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', - OrePrefixes.circuit.get(Materials.Ultimate), 'X', ItemList.Sensor_ZPM }); + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(14, 1, material, Materials.Steel, null), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid") + .get(0), 'S', + OreDictionary.getOres("cellLithiumPeroxide") + .get(0), + 'H', OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', + OrePrefixes.circuit.get(Materials.Ultimate), 'X', ItemList.Sensor_ZPM }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(16, 1, material, Materials.Steel, null), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid").get(0), 'S', - OreDictionary.getOres("cellLithiumPeroxide").get(0), 'H', - OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', - OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'X', ItemList.Sensor_UV }); + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(16, 1, material, Materials.Steel, null), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid") + .get(0), 'S', + OreDictionary.getOres("cellLithiumPeroxide") + .get(0), + 'H', OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', + OrePrefixes.circuit.get(Materials.SuperconductorUHV), 'X', ItemList.Sensor_UV }); GT_ModHandler.addCraftingRecipe( - DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(18, 1, material, Materials.Steel, null), - GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS - | GT_ModHandler.RecipeBits.BUFFERED, - new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid").get(0), 'S', - OreDictionary.getOres("cellHydrogenPeroxide").get(0), 'H', - OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', - OrePrefixes.circuit.get(Materials.Infinite), 'X', ItemList.Sensor_UHV }); + DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(18, 1, material, Materials.Steel, null), + GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS + | GT_ModHandler.RecipeBits.BUFFERED, + new Object[] { "SHE", "CPC", "PXP", 'E', OreDictionary.getOres("cellHydrofluoricAcid") + .get(0), 'S', + OreDictionary.getOres("cellHydrogenPeroxide") + .get(0), + 'H', OrePrefixes.toolHeadDrill.get(material), 'P', OrePrefixes.plate.get(material), 'C', + OrePrefixes.circuit.get(Materials.Infinite), 'X', ItemList.Sensor_UHV }); } catch (Exception ignored) {} diff --git a/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java b/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java index 36a2f22790..d195068fe8 100644 --- a/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java +++ b/src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java @@ -70,9 +70,9 @@ public class DetravToolElectricProspectorBase implements IToolStats { @Override public DamageSource getDamageSource(EntityLivingBase aPlayer, Entity aEntity) { return GT_DamageSources.getCombatDamage( - (aPlayer instanceof EntityPlayer) ? "player" : "mob", - aPlayer, - (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null); + (aPlayer instanceof EntityPlayer) ? "player" : "mob", + aPlayer, + (aEntity instanceof EntityLivingBase) ? getDeathMessage(aPlayer, (EntityLivingBase) aEntity) : null); } public String getCraftingSound() { @@ -146,7 +146,7 @@ public class DetravToolElectricProspectorBase implements IToolStats { @Override public int convertBlockDrops(List<ItemStack> list, ItemStack itemStack, EntityPlayer entityPlayer, Block block, - int i, int i1, int i2, byte b, int i3, boolean b1, BlockEvent.HarvestDropsEvent harvestDropsEvent) { + int i, int i1, int i2, byte b, int i3, boolean b1, BlockEvent.HarvestDropsEvent harvestDropsEvent) { return 0; } @@ -170,7 +170,7 @@ public class DetravToolElectricProspectorBase implements IToolStats { public short[] getRGBa(boolean aIsToolHead, ItemStack aStack) { return aIsToolHead ? GT_MetaGenerated_Tool.getPrimaryMaterial(aStack).mRGBa - : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; + : GT_MetaGenerated_Tool.getSecondaryMaterial(aStack).mRGBa; } public void onStatsAddedToTool(GT_MetaGenerated_Tool aItem, int aID) { @@ -186,16 +186,16 @@ public class DetravToolElectricProspectorBase implements IToolStats { public IChatComponent getDeathMessage(EntityLivingBase aPlayer, EntityLivingBase aEntity) { return new ChatComponentText( - EnumChatFormatting.RED + aEntity.getCommandSenderName() - + EnumChatFormatting.WHITE - + " got Pick Up'ed by " - + EnumChatFormatting.GREEN - + aPlayer.getCommandSenderName() - + EnumChatFormatting.WHITE); + EnumChatFormatting.RED + aEntity.getCommandSenderName() + + EnumChatFormatting.WHITE + + " got Pick Up'ed by " + + EnumChatFormatting.GREEN + + aPlayer.getCommandSenderName() + + EnumChatFormatting.WHITE); } public float getMiningSpeed(Block aBlock, byte aMetaData, float aDefault, EntityPlayer aPlayer, World aWorld, - int aX, int aY, int aZ) { + int aX, int aY, int aZ) { return aDefault; } } diff --git a/src/main/java/com/detrav/net/DetravNetwork.java b/src/main/java/com/detrav/net/DetravNetwork.java index 75e0a267ab..0b4dbc1af4 100644 --- a/src/main/java/com/detrav/net/DetravNetwork.java +++ b/src/main/java/com/detrav/net/DetravNetwork.java @@ -38,7 +38,12 @@ public class DetravNetwork extends MessageToMessageCodec<FMLProxyPacket, DetravP ByteBuf buf = Unpooled.buffer(); buf.writeByte(msg.getPacketID()); msg.encode(new ByteBufOutputStream(buf)); - out.add(new FMLProxyPacket(buf, ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get())); + out.add( + new FMLProxyPacket( + buf, + ctx.channel() + .attr(NetworkRegistry.FML_CHANNEL) + .get())); } @Override @@ -49,16 +54,22 @@ public class DetravNetwork extends MessageToMessageCodec<FMLProxyPacket, DetravP } public void sendToPlayer(DetravPacket aPacket, EntityPlayerMP aPlayer) { - this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET) - .set(FMLOutboundHandler.OutboundTarget.PLAYER); - this.mChannel.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPlayer); - this.mChannel.get(Side.SERVER).writeAndFlush(aPacket); + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.PLAYER); + this.mChannel.get(Side.SERVER) + .attr(FMLOutboundHandler.FML_MESSAGETARGETARGS) + .set(aPlayer); + this.mChannel.get(Side.SERVER) + .writeAndFlush(aPacket); } public void sendToServer(DetravPacket aPacket) { - this.mChannel.get(Side.CLIENT).attr(FMLOutboundHandler.FML_MESSAGETARGET) - .set(FMLOutboundHandler.OutboundTarget.TOSERVER); - this.mChannel.get(Side.CLIENT).writeAndFlush(aPacket); + this.mChannel.get(Side.CLIENT) + .attr(FMLOutboundHandler.FML_MESSAGETARGET) + .set(FMLOutboundHandler.OutboundTarget.TOSERVER); + this.mChannel.get(Side.CLIENT) + .writeAndFlush(aPacket); } @ChannelHandler.Sharable diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java index bc2f1bc9f2..23e881f86a 100644 --- a/src/main/java/com/detrav/net/ProspectingPacket.java +++ b/src/main/java/com/detrav/net/ProspectingPacket.java @@ -67,7 +67,7 @@ public class ProspectingPacket extends DetravPacket { Materials tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000]; rgba = tMaterial.getRGBA(); name = tMaterial.getLocalizedNameForItem( - GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name")); + GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name")); } else { final Werkstoff werkstoff = Werkstoff.werkstoffHashMap.getOrDefault((short) (meta * -1), null); String translated = GT_LanguageManager.getTranslation("bw.blocktype.ore"); @@ -84,13 +84,14 @@ public class ProspectingPacket extends DetravPacket { rgba = fluidColors.get((int) meta); if (rgba == null) { DetravScannerMod.proxy - .sendPlayerExeption("Unknown fluid ID = " + meta + " Please add to FluidColors.java!"); + .sendPlayerExeption("Unknown fluid ID = " + meta + " Please add to FluidColors.java!"); rgba = new short[] { 0, 0, 0, 0 }; } name = Objects.firstNonNull( - FluidRegistry.getFluid(meta).getLocalizedName(new FluidStack(FluidRegistry.getFluid(meta), 0)), - StatCollector.translateToLocal("gui.detrav.scanner.unknown_fluid")); + FluidRegistry.getFluid(meta) + .getLocalizedName(new FluidStack(FluidRegistry.getFluid(meta), 0)), + StatCollector.translateToLocal("gui.detrav.scanner.unknown_fluid")); } else if (packet.ptype == 3) { // Pollution name = StatCollector.translateToLocal("gui.detrav.scanner.pollution"); @@ -108,12 +109,12 @@ public class ProspectingPacket extends DetravPacket { public static Object decode(InputStream in) throws IOException { DataInput aData = new DataInputStream(new GZIPInputStream(in)); ProspectingPacket packet = new ProspectingPacket( - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt(), - aData.readInt()); + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt(), + aData.readInt()); packet.level = aData.readInt(); int aSize = (packet.size * 2 + 1) * 16; @@ -157,7 +158,9 @@ public class ProspectingPacket extends DetravPacket { HashMap<Byte, Short> data = map[i][j]; if (data == null) tOut.writeByte(0); else { - tOut.writeByte(data.keySet().size()); + tOut.writeByte( + data.keySet() + .size()); for (byte key : data.keySet()) { tOut.writeByte(key); tOut.writeShort(data.get(key)); diff --git a/src/main/java/com/detrav/proxies/ClientProxy.java b/src/main/java/com/detrav/proxies/ClientProxy.java index b9b978b021..bf1b745697 100644 --- a/src/main/java/com/detrav/proxies/ClientProxy.java +++ b/src/main/java/com/detrav/proxies/ClientProxy.java @@ -29,12 +29,12 @@ public class ClientProxy extends CommonProxy { public void openProspectorGUI() { EntityPlayer player = Minecraft.getMinecraft().thePlayer; player.openGui( - DetravScannerMod.instance, - DetravScannerGUI.GUI_ID, - player.worldObj, - (int) player.posX, - (int) player.posY, - (int) player.posZ); + DetravScannerMod.instance, + DetravScannerGUI.GUI_ID, + player.worldObj, + (int) player.posX, + (int) player.posY, + (int) player.posZ); } @Override diff --git a/src/main/java/com/detrav/utils/FluidColors.java b/src/main/java/com/detrav/utils/FluidColors.java index a5cd94e492..25611dbf3e 100644 --- a/src/main/java/com/detrav/utils/FluidColors.java +++ b/src/main/java/com/detrav/utils/FluidColors.java @@ -18,17 +18,34 @@ public class FluidColors { // ProgressManager.ProgressBar progressBar = ProgressManager.push("Making Fluid Colors", (int) // (Materials.values().length + // FluidRegistry.getRegisteredFluids().values().stream().filter(Objects::nonNull).count())); - Arrays.stream(Materials.values()).forEach(mat -> { - // progressBar.step(mat.mDefaultLocalName); - if (mat.getSolid(0) != null) fluidColors.putIfAbsent(mat.getSolid(0).getFluidID(), mat.mRGBa); - if (mat.getGas(0) != null) fluidColors.putIfAbsent(mat.getGas(0).getFluidID(), mat.mRGBa); - if (mat.getFluid(0) != null) fluidColors.putIfAbsent(mat.getFluid(0).getFluidID(), mat.mRGBa); - if (mat.getMolten(0) != null) fluidColors.putIfAbsent(mat.getMolten(0).getFluidID(), mat.mRGBa); - }); - FluidRegistry.getRegisteredFluids().values().stream().filter(Objects::nonNull).forEach(fluid -> { - // progressBar.step(fluid.getName()); - fluidColors.putIfAbsent(fluid.getID(), convertColorInt(fluid.getColor())); - }); + Arrays.stream(Materials.values()) + .forEach(mat -> { + // progressBar.step(mat.mDefaultLocalName); + if (mat.getSolid(0) != null) fluidColors.putIfAbsent( + mat.getSolid(0) + .getFluidID(), + mat.mRGBa); + if (mat.getGas(0) != null) fluidColors.putIfAbsent( + mat.getGas(0) + .getFluidID(), + mat.mRGBa); + if (mat.getFluid(0) != null) fluidColors.putIfAbsent( + mat.getFluid(0) + .getFluidID(), + mat.mRGBa); + if (mat.getMolten(0) != null) fluidColors.putIfAbsent( + mat.getMolten(0) + .getFluidID(), + mat.mRGBa); + }); + FluidRegistry.getRegisteredFluids() + .values() + .stream() + .filter(Objects::nonNull) + .forEach(fluid -> { + // progressBar.step(fluid.getName()); + fluidColors.putIfAbsent(fluid.getID(), convertColorInt(fluid.getColor())); + }); // ProgressManager.pop(progressBar); } @@ -45,28 +62,59 @@ public class FluidColors { // fluidColors.put(Materials.Naquadah.getMolten(0).getFluid().getID(), new short[]{0x20, 0x20, 0x20}); // fluidColors.put(Materials.NaquadahEnriched.getMolten(0).getFluid().getID(), new short[]{0x60, 0x60, // 0x60}); - fluidColors.put(Materials.Lead.getMolten(0).getFluid().getID(), new short[] { 0xd0, 0xd0, 0xd0 }); + fluidColors.put( + Materials.Lead.getMolten(0) + .getFluid() + .getID(), + new short[] { 0xd0, 0xd0, 0xd0 }); fluidColors.put(Materials.Chlorobenzene.mFluid.getID(), new short[] { 0x40, 0x80, 0x40 }); - fluidColors.put(FluidRegistry.getFluid("liquid_extra_heavy_oil").getID(), new short[] { 0x00, 0x00, 0x50 }); + fluidColors.put( + FluidRegistry.getFluid("liquid_extra_heavy_oil") + .getID(), + new short[] { 0x00, 0x00, 0x50 }); fluidColors.put(Materials.Oxygen.mGas.getID(), new short[] { 0x40, 0x40, 0xA0 }); fluidColors.put(Materials.Nitrogen.mGas.getID(), new short[] { 0x00, 0x80, 0xd0 }); fluidColors.put(Materials.Methane.mGas.getID(), new short[] { 0x80, 0x20, 0x20 }); fluidColors.put(Materials.Ethane.mGas.getID(), new short[] { 0x40, 0x80, 0x20 }); fluidColors.put(Materials.Ethylene.mGas.getID(), new short[] { 0xd0, 0xd0, 0xd0 }); fluidColors.put(FluidRegistry.LAVA.getID(), new short[] { 0xFF, 0x00, 0x00 }); - fluidColors.put(FluidRegistry.getFluid("unknowwater").getID(), new short[] { 0x8A, 0x2B, 0xE2 }); + fluidColors.put( + FluidRegistry.getFluid("unknowwater") + .getID(), + new short[] { 0x8A, 0x2B, 0xE2 }); fluidColors.put(Materials.Hydrogen.mGas.getID(), new short[] { 0x32, 0x32, 0xD6 }); fluidColors.put(Materials.SulfuricAcid.mFluid.getID(), new short[] { 0xFF, 0xB9, 0x0F }); fluidColors.put(Materials.HydricSulfide.mFluid.getID(), new short[] { 0xFF, 0x8F, 0x43 }); fluidColors.put(Materials.CarbonMonoxide.mGas.getID(), new short[] { 0x10, 0x4E, 0x8B }); fluidColors.put(Materials.CarbonDioxide.mGas.getID(), new short[] { 0x69, 0x69, 0x69 }); - fluidColors.put(FluidRegistry.getFluid("ic2distilledwater").getID(), new short[] { 0x1E, 0x90, 0xFF }); + fluidColors.put( + FluidRegistry.getFluid("ic2distilledwater") + .getID(), + new short[] { 0x1E, 0x90, 0xFF }); fluidColors.put(Materials.Deuterium.mGas.getID(), new short[] { 0xFF, 0xE3, 0x9F }); - fluidColors.put(Materials.Iron.getMolten(0).getFluid().getID(), new short[] { 0x8B, 0x88, 0x78 }); - fluidColors.put(Materials.Tin.getMolten(0).getFluid().getID(), new short[] { 0xE7, 0xE7, 0xE4 }); - fluidColors.put(Materials.Copper.getMolten(0).getFluid().getID(), new short[] { 0xFF, 0x7F, 0x24 }); - fluidColors.put(FluidRegistry.getFluid("fluorine").getID(), new short[] { 0x99, 0xC1, 0xAD }); - fluidColors.put(FluidRegistry.getFluid("hydrofluoricacid").getID(), new short[] { 0x00, 0xCE, 0xD1 }); + fluidColors.put( + Materials.Iron.getMolten(0) + .getFluid() + .getID(), + new short[] { 0x8B, 0x88, 0x78 }); + fluidColors.put( + Materials.Tin.getMolten(0) + .getFluid() + .getID(), + new short[] { 0xE7, 0xE7, 0xE4 }); + fluidColors.put( + Materials.Copper.getMolten(0) + .getFluid() + .getID(), + new short[] { 0xFF, 0x7F, 0x24 }); + fluidColors.put( + FluidRegistry.getFluid("fluorine") + .getID(), + new short[] { 0x99, 0xC1, 0xAD }); + fluidColors.put( + FluidRegistry.getFluid("hydrofluoricacid") + .getID(), + new short[] { 0x00, 0xCE, 0xD1 }); fluidColors.put(Materials.PhosphoricAcid.mFluid.getID(), new short[] { 0xEE, 0x76, 0x00 }); // possible nulls diff --git a/src/main/java/com/detrav/utils/GTppHelper.java b/src/main/java/com/detrav/utils/GTppHelper.java index 59db67eac7..dd86b3d9f6 100644 --- a/src/main/java/com/detrav/utils/GTppHelper.java +++ b/src/main/java/com/detrav/utils/GTppHelper.java @@ -25,7 +25,7 @@ public class GTppHelper { try { Short i = (short) (n + 1); Material m = ((Material) gtPlusPlus.core.material.ORES.class.getFields()[n] - .get(gtPlusPlus.core.material.ORES.class.getFields()[n])); + .get(gtPlusPlus.core.material.ORES.class.getFields()[n])); decodeoresGTpp.put(i, m); encodeoresGTpp.put(m, i); } catch (Exception ignored) {} |