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 --- src/main/java/com/detrav/DetravScannerMod.java | 12 +- .../com/detrav/Detrav_AfterGTPreload_Loader.java | 4 +- .../com/detrav/commands/DetravScannerCommand.java | 6 +- .../java/com/detrav/enums/DetravToolDictNames.java | 6 +- src/main/java/com/detrav/gui/DetravGuiProPick.java | 134 -------- src/main/java/com/detrav/gui/DetravScannerGUI.java | 82 +++++ src/main/java/com/detrav/gui/OresList.java | 61 ++++ .../com/detrav/gui/textures/DetravMapTexture.java | 98 ++++-- .../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 +++++++++++ src/main/java/com/detrav/net/DetravNetwork.java | 20 +- src/main/java/com/detrav/net/DetravPacket.java | 4 - .../java/com/detrav/net/DetravProPickPacket00.java | 341 -------------------- .../java/com/detrav/net/ProspectingPacket.java | 185 +++++++++++ src/main/java/com/detrav/proxies/ClientProxy.java | 18 +- src/main/java/com/detrav/proxies/CommonProxy.java | 14 +- .../java/com/detrav/utils/DetravCreativeTab.java | 28 +- src/main/java/com/detrav/utils/FluidColors.java | 4 +- src/main/java/com/detrav/utils/GTppHelper.java | 10 +- 29 files changed, 1034 insertions(+), 1409 deletions(-) delete mode 100644 src/main/java/com/detrav/gui/DetravGuiProPick.java create mode 100644 src/main/java/com/detrav/gui/DetravScannerGUI.java create mode 100644 src/main/java/com/detrav/gui/OresList.java 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 delete mode 100644 src/main/java/com/detrav/net/DetravProPickPacket00.java create mode 100644 src/main/java/com/detrav/net/ProspectingPacket.java (limited to 'src/main/java/com') diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java index acf8ffec76..92ad44617a 100644 --- a/src/main/java/com/detrav/DetravScannerMod.java +++ b/src/main/java/com/detrav/DetravScannerMod.java @@ -24,10 +24,13 @@ import net.minecraftforge.common.config.Configuration; public class DetravScannerMod { public static final String MODID = "detravscannermod"; - public static final String VERSION = "1.5.7"; + public static final String VERSION = "1.6.0"; public static final String DEBUGOVERRIDE = "@false"; public static final boolean DEBUGBUILD = Boolean.parseBoolean(DEBUGOVERRIDE.substring(1)); public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab(); + public static boolean isDreamcraftLoaded = false; + public static boolean isBartWorksLoaded = false; + public static boolean isGTppLoaded = false; public static final org.apache.logging.log4j.Logger Logger = LogManager.getLogger("GT Scanner Mod"); @@ -39,6 +42,10 @@ public class DetravScannerMod public DetravScannerMod() { GregTech_API.sAfterGTPreload.add(new Detrav_AfterGTPreload_Loader()); + isDreamcraftLoaded = Loader.isModLoaded("dreamcraft"); + isBartWorksLoaded = Loader.isModLoaded("bartworks"); + isGTppLoaded = Loader.isModLoaded("miscutils"); + new DetravNetwork(); } @@ -64,8 +71,7 @@ public class DetravScannerMod @EventHandler public void onPostLoad(FMLPostInitializationEvent aEvent) { proxy.onPostLoad(); - if (Loader.isModLoaded("miscutils")) - GTppHelper.generate_OreIDs(); + if (isGTppLoaded) GTppHelper.generate_OreIDs(); FluidColors.makeColors(); } diff --git a/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java index db9011b1c8..cff4e6eec9 100644 --- a/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java +++ b/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java @@ -1,7 +1,7 @@ package com.detrav; import com.detrav.items.DetravMetaGeneratedTool01; -import com.detrav.items.processing.ProcessingDetravToolProPick; +import com.detrav.items.processing.ProcessingDetravToolProspector; /** * Created by wital_000 on 18.03.2016. @@ -14,7 +14,7 @@ public class Detrav_AfterGTPreload_Loader implements Runnable { new DetravMetaGeneratedTool01(); //recipes and etc - new ProcessingDetravToolProPick(); + new ProcessingDetravToolProspector(); } } diff --git a/src/main/java/com/detrav/commands/DetravScannerCommand.java b/src/main/java/com/detrav/commands/DetravScannerCommand.java index 22f5d2c279..90dd4310a8 100644 --- a/src/main/java/com/detrav/commands/DetravScannerCommand.java +++ b/src/main/java/com/detrav/commands/DetravScannerCommand.java @@ -23,8 +23,7 @@ public class DetravScannerCommand implements ICommand { private List aliases; - public DetravScannerCommand() - { + public DetravScannerCommand() { this.aliases = new ArrayList(); this.aliases.add("DetravScanner"); this.aliases.add("dscan"); @@ -123,8 +122,7 @@ public class DetravScannerCommand implements ICommand { } sender.addChatMessage(new ChatComponentText("*** Detrav Scanner Begin")); - for(String key : ores.keySet()) - { + for(String key : ores.keySet()) { sender.addChatMessage(new ChatComponentText(String.format("%s : %d", key, ores.get(key)))); } sender.addChatMessage(new ChatComponentText("*** Detrav Scanner End")); diff --git a/src/main/java/com/detrav/enums/DetravToolDictNames.java b/src/main/java/com/detrav/enums/DetravToolDictNames.java index 6f50a385b2..128545360c 100644 --- a/src/main/java/com/detrav/enums/DetravToolDictNames.java +++ b/src/main/java/com/detrav/enums/DetravToolDictNames.java @@ -3,7 +3,7 @@ package com.detrav.enums; /** * Created by wital_000 on 19.03.2016. */ -public enum DetravToolDictNames { - craftingToolElectricProPick, - craftingToolProPick, +public enum DetravToolDictNames { + craftingToolElectricProspector, + craftingToolProspector, } diff --git a/src/main/java/com/detrav/gui/DetravGuiProPick.java b/src/main/java/com/detrav/gui/DetravGuiProPick.java deleted file mode 100644 index b62be499fe..0000000000 --- a/src/main/java/com/detrav/gui/DetravGuiProPick.java +++ /dev/null @@ -1,134 +0,0 @@ -package com.detrav.gui; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; - -import org.lwjgl.opengl.GL11; - -import com.detrav.gui.textures.DetravMapTexture; - -import cpw.mods.fml.client.GuiScrollingList; -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.ResourceLocation; - -/** - * Created by wital_000 on 21.03.2016. - */ -public class DetravGuiProPick extends GuiScreen { - public static final int GUI_ID = 20; - private static DetravMapTexture map = null; - ListOres ores = null; - - public DetravGuiProPick() - { - - } - - public static void newMap(DetravMapTexture aMap) { - if (map != null) { - map.deleteGlTexture(); - map = null; - } - map = aMap; - map.loadTexture(null); - //ores = new ListOres(Minecraft.getMinecraft(),) - } - - int prevW; - int prevH; - - - private static int minHeight = 128; - private static int minWidth = 128; - - private static final ResourceLocation back = new ResourceLocation("gregtech:textures/gui/propick.png"); - - @Override - public void drawScreen(int x, int y, float f) { - this.drawDefaultBackground(); - if(map!=null) - { - int currentWidth = Math.max(map.width,minWidth); - int currentHeight = Math.max(map.height,minHeight); - int aX = (this.width - currentWidth-100)/2; - int aY = (this.height - currentHeight)/2; - - if(ores == null) - { - ores = new ListOres(this,100,currentHeight,aY,aY+currentHeight,aX+currentWidth,10,map.ores); - prevW = width; - prevH = height; - } - if(prevW!=width || prevH !=height) - { - ores = new ListOres(this,100,currentHeight,aY,aY+currentHeight,aX+currentWidth,10,map.ores); - prevW = width; - prevH = height; - } - - - //dradback for ores - drawRect(aX,aY,aX+currentWidth+100,aY+currentHeight,0xFFC6C6C6); - map.glBindTexture(); - map.draw(aX,aY); - ores.drawScreen(x,y,f); - mc.getTextureManager().bindTexture(back); - GL11.glColor4f(0xFF, 0xFF, 0xFF, 0xFF); - //drawcorners - drawTexturedModalRect(aX-5,aY-5,0,0,5,5);//leftTop - drawTexturedModalRect(aX+currentWidth+100,aY-5,171,0,5,5);//RightTop - drawTexturedModalRect(aX-5,aY+currentHeight,0,161,5,5);//leftDown - drawTexturedModalRect(aX+currentWidth+100,aY+currentHeight,171,161,5,5);//RightDown - //draw edges - for(int i = aX;i ores = null; - List keys = null; - - public ListOres(GuiScreen parent, int width, int height, int top, int bottom, int left, int entryHeight,HashMap aOres) { - super(parent.mc, width, height, top, bottom, left, entryHeight); - ores = aOres; - keys = new ArrayList(map.ores.keySet()); - Collections.sort(keys); - } - - @Override - protected int getSize() { - return ores.size(); - } - - @Override - protected void elementClicked(int index, boolean doubleClick) { - - } - - @Override - protected boolean isSelected(int index) { - return false; - } - - @Override - protected void drawBackground() { - //drawRect(this.left,this.top,this.listWidth,this.listHeight,0xFFFFFFFF); - } - - @Override - protected void drawSlot(int slotIdx, int entryRight, int slotTop, int slotBuffer, Tessellator tess) { - //drawString(fontRendererObj,); - //fontRendererObj.drawString(fontRendererObj.trimStringToWidth()) - - fontRendererObj.drawString(fontRendererObj.trimStringToWidth(keys.get(slotIdx), listWidth - 10), this.left + 3 , slotTop + 2, ores.get(keys.get(slotIdx))); - - } - } -} diff --git a/src/main/java/com/detrav/gui/DetravScannerGUI.java b/src/main/java/com/detrav/gui/DetravScannerGUI.java new file mode 100644 index 0000000000..bc275afca5 --- /dev/null +++ b/src/main/java/com/detrav/gui/DetravScannerGUI.java @@ -0,0 +1,82 @@ +package com.detrav.gui; + +import org.lwjgl.opengl.GL11; + +import com.detrav.gui.textures.DetravMapTexture; + +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.util.ResourceLocation; + +/** + * Created by wital_000 on 21.03.2016. + */ +public class DetravScannerGUI extends GuiScreen { + public static final int GUI_ID = 20; + private static DetravMapTexture map = null; + OresList oresList = null; + + private final static int minHeight = 128; + private final static int minWidth = 128; + private int prevW; + private int prevH; + + private static final ResourceLocation back = new ResourceLocation("gregtech:textures/gui/propick.png"); + + public DetravScannerGUI() { + + } + + public static void newMap(DetravMapTexture aMap) { + if (map != null) { + map.deleteGlTexture(); + map = null; + } + map = aMap; + map.loadTexture(null); + } + + + @Override + public void drawScreen(int x, int y, float f) { + this.drawDefaultBackground(); + if(map == null) return; + + int currentWidth = Math.max(map.width, minWidth); + int currentHeight = Math.max(map.height, minHeight); + int aX = (this.width - currentWidth-100)/2; + int aY = (this.height - currentHeight)/2; + + if(oresList == null || (prevW != width || prevH != height)) { + oresList = new OresList( + this, 100, currentHeight, aY, aY+currentHeight, aX+currentWidth, 10, map.packet.ores, + (name -> { + if (map != null) map.loadTexture(null, name); + }) + ); + prevW = width; + prevH = height; + } + + // draw back for ores + drawRect(aX,aY,aX+currentWidth+100,aY+currentHeight,0xFFC6C6C6); + map.glBindTexture(); + map.draw(aX,aY); + oresList.drawScreen(x, y, f); + mc.getTextureManager().bindTexture(back); + GL11.glColor4f(0xFF, 0xFF, 0xFF, 0xFF); + + // draw corners + drawTexturedModalRect(aX-5,aY-5,0,0,5,5);//leftTop + drawTexturedModalRect(aX+currentWidth+100,aY-5,171,0,5,5);//RightTop + drawTexturedModalRect(aX-5,aY+currentHeight,0,161,5,5);//leftDown + drawTexturedModalRect(aX+currentWidth+100,aY+currentHeight,171,161,5,5);//RightDown + + // draw edges + for(int i = aX ; i ores; + private final List keys; + private final GuiScreen parent; + private final Consumer onSelected; + + private int selected = -1; + + public OresList(GuiScreen parent, int width, int height, int top, int bottom, int left, int entryHeight, HashMap aOres, Consumer onSelected) { + super(parent.mc, width, height, top, bottom, left, entryHeight); + this.parent = parent; + this.onSelected = onSelected; + ores = aOres; + keys = new ArrayList(ores.keySet()); + Collections.sort(keys); + keys.add(0, "All"); + selected = 0; + } + + @Override + protected int getSize() { + return ores.size(); + } + + @Override + protected void elementClicked(int index, boolean doubleClick) { + selected = index; + if(onSelected != null) onSelected.accept(keys.get(index)); + } + + @Override + protected boolean isSelected(int index) { + return selected == index; + } + + @Override + protected void drawBackground() {} + + @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, + 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 58d69260ce..5cf913985c 100644 --- a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java +++ b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java @@ -1,48 +1,100 @@ package com.detrav.gui.textures; -import java.awt.image.BufferedImage; -import java.util.HashMap; - -import org.lwjgl.opengl.GL11; - -import com.detrav.net.DetravProPickPacket00; - -import net.minecraft.client.Minecraft; +import com.detrav.net.ProspectingPacket; import net.minecraft.client.renderer.Tessellator; import net.minecraft.client.renderer.texture.AbstractTexture; import net.minecraft.client.renderer.texture.TextureUtil; import net.minecraft.client.resources.IResourceManager; +import org.lwjgl.opengl.GL11; + +import java.awt.Color; +import java.awt.image.BufferedImage; +import java.awt.image.WritableRaster; /** * Created by wital_000 on 21.03.2016. */ public class DetravMapTexture extends AbstractTexture { - private DetravProPickPacket00 packet; + public final ProspectingPacket packet; + private String selected = "All"; + public int width = -1; + public int height = -1; - public DetravMapTexture(DetravProPickPacket00 aPacket) + public DetravMapTexture(ProspectingPacket aPacket) { packet = aPacket; } - public int width = -1; - public int height = -1; - public HashMap ores = null; + private BufferedImage getImage() { + int wh = (packet.size * 2 + 1) * 16; + + BufferedImage image = new BufferedImage(wh, wh, BufferedImage.TYPE_INT_ARGB); + WritableRaster raster = image.getRaster(); + + int playerI = packet.posX - (packet.chunkX - packet.size) * 16 - 1; // Correct player offset + int playerJ = packet.posZ - (packet.chunkZ - packet.size) * 16 - 1; + for (int i = 0; i < wh; i++) { + for (int j = 0; j < wh; j++) { + image.setRGB(i, j, Color.WHITE.getRGB()); + if (packet.map[i][j] != null) { + if (packet.ptype == 0 || packet.ptype == 1) { + for (short meta : packet.map[i][j].values()) { + final String name = packet.metaMap.get(meta); + if (!selected.equals("All") && !selected.equals(name)) continue; + image.setRGB(i, j, packet.ores.get(name) | 0XFF000000); + break; + } + } else if (packet.ptype == 2) { + final short fluidId = packet.map[i][j].get((byte) 1), 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) ) { + image.setRGB(i, j, packet.ores.get(name)); + } + }else if (packet.ptype == 3) { + final short meta = packet.map[i][j].get((byte) 1); + final String name = packet.metaMap.get(meta); + image.setRGB(i, j, packet.ores.get(name)); + } + } + // draw player pos + if (i == playerI || j == playerJ) { + raster.setSample(i, j, 0, (raster.getSample(i, j, 0) + 255) / 2); + raster.setSample(i, j, 1, raster.getSample(i, j, 1) / 2); + raster.setSample(i, j, 2, raster.getSample(i, j, 2) / 2); + } + // draw grid + if ((i) % 16 == 0 || (j) % 16 == 0) { + raster.setSample(i, j, 0, raster.getSample(i, j, 0) / 2); + raster.setSample(i, j, 1, raster.getSample(i, j, 1) / 2); + raster.setSample(i, j, 2, raster.getSample(i, j, 2) / 2); + } + } + } + + return image; + } + @Override - public void loadTexture(IResourceManager p_110551_1_){ + public void loadTexture(IResourceManager resourceManager){ this.deleteGlTexture(); - if(packet!=null) - { + if(packet != null) { int tId = getGlTextureId(); if(tId <0) return; - BufferedImage bufferedimage = packet.getImage((int)Minecraft.getMinecraft().thePlayer.posX,(int)Minecraft.getMinecraft().thePlayer.posZ); - TextureUtil.uploadTextureImageAllocate(this.getGlTextureId(), bufferedimage, false, false); + TextureUtil.uploadTextureImageAllocate(this.getGlTextureId(), getImage(), false, false); width = packet.getSize(); height = packet.getSize(); - ores = packet.getOres(); } - //GL11.glDrawPixels(); + } + + public void loadTexture(IResourceManager resourceManager, String selected){ + this.selected = selected; + loadTexture(resourceManager); } public int glBindTexture() { @@ -51,12 +103,10 @@ public class DetravMapTexture extends AbstractTexture { return this.glTextureId; } - public void draw(int x, int y) - { + public void draw(int x, int y) { float f = 1F / (float)width; float f1 = 1F / (float)height; - int u = 0; - int v = 0; + int u = 0, v = 0; Tessellator tessellator = Tessellator.instance; tessellator.startDrawingQuads(); tessellator.addVertexWithUV((double)(x), (double)(y + height), 0, (double)((float)(u) * f), (double)((float)(v + height) * f1)); 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; -