From 1b820de08a05070909a267e17f033fcf58ac8710 Mon Sep 17 00:00:00 2001 From: NotAPenguin Date: Mon, 2 Sep 2024 23:17:17 +0200 Subject: The Great Renaming (#3014) * move kekztech to a single root dir * move detrav to a single root dir * move gtnh-lanthanides to a single root dir * move tectech and delete some gross reflection in gt++ * remove more reflection inside gt5u * delete more reflection in gt++ * fix imports * move bartworks and bwcrossmod * fix proxies * move galactigreg and ggfab * move gtneioreplugin * try to fix gt++ bee loader * apply the rename rules to BW * apply rename rules to bwcrossmod * apply rename rules to detrav scanner mod * apply rename rules to galacticgreg * apply rename rules to ggfab * apply rename rules to goodgenerator * apply rename rules to gtnh-lanthanides * apply rename rules to gt++ * apply rename rules to kekztech * apply rename rules to kubatech * apply rename rules to tectech * apply rename rules to gt apply the rename rules to gt * fix tt import * fix mui hopefully * fix coremod except intergalactic * rename assline recipe class * fix a class name i stumbled on * rename StructureUtility to GTStructureUtility to prevent conflict with structurelib * temporary rename of GTTooltipDataCache to old name * fix gt client/server proxy names --- src/main/java/com/detrav/DetravScannerMod.java | 75 ---- .../com/detrav/Detrav_AfterGTPreload_Loader.java | 21 - .../com/detrav/commands/DetravScannerCommand.java | 158 -------- .../java/com/detrav/enums/DetravToolDictNames.java | 9 - src/main/java/com/detrav/enums/Textures01.java | 17 - .../com/detrav/events/DetravLoginEventHandler.java | 24 -- src/main/java/com/detrav/gui/DetravScannerGUI.java | 121 ------ src/main/java/com/detrav/gui/OresList.java | 66 ---- .../com/detrav/gui/textures/DetravMapTexture.java | 145 ------- .../detrav/items/DetravMetaGeneratedTool01.java | 360 ------------------ .../BehaviourDetravToolElectricProspector.java | 253 ------------- .../behaviours/BehaviourDetravToolProspector.java | 421 --------------------- .../processing/ProcessingDetravToolProspector.java | 131 ------- .../com/detrav/items/tools/DetravProspector.java | 35 -- .../items/tools/DetravToolElectricProspector.java | 34 -- .../tools/DetravToolElectricProspectorBase.java | 201 ---------- src/main/java/com/detrav/net/DetravNetwork.java | 83 ---- src/main/java/com/detrav/net/DetravPacket.java | 16 - .../java/com/detrav/net/ProspectingPacket.java | 191 ---------- src/main/java/com/detrav/proxies/ClientProxy.java | 49 --- src/main/java/com/detrav/proxies/CommonProxy.java | 55 --- src/main/java/com/detrav/proxies/ServerProxy.java | 22 -- .../java/com/detrav/utils/BartWorksHelper.java | 23 -- .../java/com/detrav/utils/DetravCreativeTab.java | 52 --- src/main/java/com/detrav/utils/FluidColors.java | 135 ------- src/main/java/com/detrav/utils/GTppHelper.java | 67 ---- 26 files changed, 2764 deletions(-) delete mode 100644 src/main/java/com/detrav/DetravScannerMod.java delete mode 100644 src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java delete mode 100644 src/main/java/com/detrav/commands/DetravScannerCommand.java delete mode 100644 src/main/java/com/detrav/enums/DetravToolDictNames.java delete mode 100644 src/main/java/com/detrav/enums/Textures01.java delete mode 100644 src/main/java/com/detrav/events/DetravLoginEventHandler.java delete mode 100644 src/main/java/com/detrav/gui/DetravScannerGUI.java delete mode 100644 src/main/java/com/detrav/gui/OresList.java delete mode 100644 src/main/java/com/detrav/gui/textures/DetravMapTexture.java delete mode 100644 src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java delete mode 100644 src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java delete mode 100644 src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java delete mode 100644 src/main/java/com/detrav/items/processing/ProcessingDetravToolProspector.java delete mode 100644 src/main/java/com/detrav/items/tools/DetravProspector.java delete mode 100644 src/main/java/com/detrav/items/tools/DetravToolElectricProspector.java delete mode 100644 src/main/java/com/detrav/items/tools/DetravToolElectricProspectorBase.java delete mode 100644 src/main/java/com/detrav/net/DetravNetwork.java delete mode 100644 src/main/java/com/detrav/net/DetravPacket.java delete mode 100644 src/main/java/com/detrav/net/ProspectingPacket.java delete mode 100644 src/main/java/com/detrav/proxies/ClientProxy.java delete mode 100644 src/main/java/com/detrav/proxies/CommonProxy.java delete mode 100644 src/main/java/com/detrav/proxies/ServerProxy.java delete mode 100644 src/main/java/com/detrav/utils/BartWorksHelper.java delete mode 100644 src/main/java/com/detrav/utils/DetravCreativeTab.java delete mode 100644 src/main/java/com/detrav/utils/FluidColors.java delete mode 100644 src/main/java/com/detrav/utils/GTppHelper.java (limited to 'src/main/java/com/detrav') diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java deleted file mode 100644 index 99a9d9eab1..0000000000 --- a/src/main/java/com/detrav/DetravScannerMod.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.detrav; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraftforge.common.config.Configuration; - -import com.detrav.net.DetravNetwork; -import com.detrav.proxies.CommonProxy; -import com.detrav.utils.DetravCreativeTab; -import com.detrav.utils.FluidColors; -import com.detrav.utils.GTppHelper; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.Mod; -import cpw.mods.fml.common.Mod.EventHandler; -import cpw.mods.fml.common.SidedProxy; -import cpw.mods.fml.common.event.FMLInitializationEvent; -import cpw.mods.fml.common.event.FMLPostInitializationEvent; -import cpw.mods.fml.common.event.FMLPreInitializationEvent; -import cpw.mods.fml.common.network.NetworkRegistry; -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") -public class DetravScannerMod { - - public static final String MODID = "detravscannermod"; - public static final boolean DEBUG_ENABLED = Boolean.parseBoolean(System.getProperty("com.detrav.debug", "false")); - public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab(); - public static boolean isDreamcraftLoaded = false; - public static boolean isBartWorksLoaded = false; - public static boolean isGTppLoaded = false; - - @SidedProxy(clientSide = "com.detrav.proxies.ClientProxy", serverSide = "com.detrav.proxies.ServerProxy") - public static CommonProxy proxy; - - @Mod.Instance(DetravScannerMod.MODID) - public static DetravScannerMod instance; - - public DetravScannerMod() { - GregTech_API.sAfterGTPreload.add(new Detrav_AfterGTPreload_Loader()); - isDreamcraftLoaded = Loader.isModLoaded("dreamcraft"); - isBartWorksLoaded = Loader.isModLoaded("bartworks"); - isGTppLoaded = Loader.isModLoaded("miscutils"); - - new DetravNetwork(); - } - - @EventHandler - public void preInit(FMLPreInitializationEvent event) { - Configuration Config = new Configuration(event.getSuggestedConfigurationFile()); - Config.load(); - - if (Config.hasChanged()) { - Config.save(); - } - - proxy.onPreInit(); - } - - @EventHandler - public void init(FMLInitializationEvent event) { - NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy); - proxy.onLoad(); - } - - @EventHandler - public void onPostLoad(FMLPostInitializationEvent aEvent) { - proxy.onPostLoad(); - 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 deleted file mode 100644 index 5cdb2bff88..0000000000 --- a/src/main/java/com/detrav/Detrav_AfterGTPreload_Loader.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.detrav; - -import com.detrav.items.DetravMetaGeneratedTool01; -import com.detrav.items.processing.ProcessingDetravToolProspector; - -/** - * Created by wital_000 on 18.03.2016. - */ -public class Detrav_AfterGTPreload_Loader implements Runnable { - - @Override - public void run() { - - // items - new DetravMetaGeneratedTool01(); - - // recipes and etc - new ProcessingDetravToolProspector(); - - } -} diff --git a/src/main/java/com/detrav/commands/DetravScannerCommand.java b/src/main/java/com/detrav/commands/DetravScannerCommand.java deleted file mode 100644 index decb661cb0..0000000000 --- a/src/main/java/com/detrav/commands/DetravScannerCommand.java +++ /dev/null @@ -1,158 +0,0 @@ -package com.detrav.commands; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.command.ICommand; -import net.minecraft.command.ICommandSender; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.ChunkCoordinates; -import net.minecraft.world.chunk.Chunk; - -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -import gregtech.api.util.GT_LanguageManager; -import gregtech.common.blocks.GT_TileEntity_Ores; - -/** - * Created by wital_000 on 17.03.2016. - */ -public class DetravScannerCommand implements ICommand { - - private List aliases; - - public DetravScannerCommand() { - this.aliases = new ArrayList(); - this.aliases.add("DetravScanner"); - this.aliases.add("dscan"); - } - - @Override - public String getCommandName() { - return "DetravScanner"; - } - - @Override - public String getCommandUsage(ICommandSender sender) { - return "DetravScanner [\"Part of Greg ore name\"]"; - } - - @Override - public List getCommandAliases() { - return this.aliases; - } - - @Override - public void processCommand(ICommandSender sender, String[] args) { - int aX = 0; - int aZ = 0; - int aY = 0; - String name = null; - - ArrayList strs = new ArrayList<>(); - for (int i = 0; i < args.length; i++) { - strs.add(args[i]); - if (args[i].startsWith("\"")) { - for (i++; i < args.length; i++) { - String temp = (String) strs.get(strs.size() - 1); - temp = temp + " " + args[i]; - temp = temp.replace("\"", ""); - strs.set(strs.size() - 1, temp); - if (args[i].endsWith("\"")) break; - } - } - } - args = new String[strs.size()]; - args = strs.toArray(args); - - switch (args.length) { - case 0: - break; - case 1: - if (args[0].toLowerCase() == "help") { - sendHelpMessage(sender); - return; - } - name = args[0]; - break; - default: - sendHelpMessage(sender); - return; - } - ChunkCoordinates c = sender.getPlayerCoordinates(); - if (name != null) name = name.toLowerCase(); - process(sender, (int) Math.floor(c.posX / 16.0), (int) Math.floor(c.posZ / 16.0), name); - } - - private void process(ICommandSender sender, int aX, int aZ, String fName) { - Chunk c = sender.getEntityWorld() - .getChunkFromChunkCoords(aX, aZ); - if (c == null) sender.addChatMessage(new ChatComponentText("ERROR")); - HashMap ores = new HashMap<>(); - for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) { - int ySize = c.getHeightValue(x, z); - for (int y = 1; y < ySize; y++) { - Block b = c.getBlock(x, y, z); - if (b == GregTech_API.sBlockOres1) { - TileEntity entity = c.getTileEntityUnsafe(x, y, z); - if (entity != null) { - 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); - if (name.startsWith("Small")) continue; - if (fName == null || name.toLowerCase() - .contains(fName)) { - if (!ores.containsKey(name)) ores.put(name, 1); - else { - int val = ores.get(name); - ores.put(name, val + 1); - } - } - } - } - } - - } - sender.addChatMessage(new ChatComponentText("*** Detrav Scanner Begin")); - for (String key : ores.keySet()) { - sender.addChatMessage(new ChatComponentText(String.format("%s : %d", key, ores.get(key)))); - } - sender.addChatMessage(new ChatComponentText("*** Detrav Scanner End")); - } - - private void sendHelpMessage(ICommandSender sender) { - sender.addChatMessage(new ChatComponentText(getCommandUsage(sender))); - } - - @Override - public boolean canCommandSenderUseCommand(ICommandSender p_71519_1_) { - return true; - } - - @Override - public List addTabCompletionOptions(ICommandSender sender, String[] args) { - if (args.length != 1) return null; - if ("help".startsWith(args[0].toLowerCase())) { - List result = new ArrayList(); - result.add("help"); - sendHelpMessage(sender); - return result; - } - return null; - } - - @Override - public boolean isUsernameIndex(String[] p_82358_1_, int p_82358_2_) { - return false; - } - - @Override - public int compareTo(Object o) { - return 0; - } -} diff --git a/src/main/java/com/detrav/enums/DetravToolDictNames.java b/src/main/java/com/detrav/enums/DetravToolDictNames.java deleted file mode 100644 index 128545360c..0000000000 --- a/src/main/java/com/detrav/enums/DetravToolDictNames.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.detrav.enums; - -/** - * Created by wital_000 on 19.03.2016. - */ -public enum DetravToolDictNames { - craftingToolElectricProspector, - craftingToolProspector, -} diff --git a/src/main/java/com/detrav/enums/Textures01.java b/src/main/java/com/detrav/enums/Textures01.java deleted file mode 100644 index 865d30e724..0000000000 --- a/src/main/java/com/detrav/enums/Textures01.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.detrav.enums; - -import gregtech.api.enums.Textures; -import gregtech.api.interfaces.IIconContainer; - -/** - * Created by wital_000 on 19.03.2016. - */ -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"), }; -} diff --git a/src/main/java/com/detrav/events/DetravLoginEventHandler.java b/src/main/java/com/detrav/events/DetravLoginEventHandler.java deleted file mode 100644 index f8e6fe31b4..0000000000 --- a/src/main/java/com/detrav/events/DetravLoginEventHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.detrav.events; - -import net.minecraftforge.common.MinecraftForge; - -import cpw.mods.fml.common.FMLCommonHandler; - -/** - * Created by wital_000 on 18.04.2016. - */ -public class DetravLoginEventHandler { - - static boolean inited = false; - - public static void register() { - if (!inited) { - inited = true; - DetravLoginEventHandler handler = new DetravLoginEventHandler(); - MinecraftForge.EVENT_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 deleted file mode 100644 index 14f3742c90..0000000000 --- a/src/main/java/com/detrav/gui/DetravScannerGUI.java +++ /dev/null @@ -1,121 +0,0 @@ -package com.detrav.gui; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.util.ResourceLocation; -import net.minecraft.util.StatCollector; - -import org.lwjgl.opengl.GL11; - -import com.detrav.gui.textures.DetravMapTexture; - -import gregtech.api.util.GT_Utility; - -/** - * 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, invert) -> { if (map != null) map.loadTexture(null, name, invert); })); - 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 < aX + currentWidth + 100; i += 128) - drawTexturedModalRect(i, aY - 5, 5, 0, Math.min(128, aX + currentWidth + 100 - i), 5); // top - for (int i = aX; i < aX + currentWidth + 100; i += 128) - drawTexturedModalRect(i, aY + currentHeight, 5, 161, Math.min(128, aX + currentWidth + 100 - i), 5); // down - for (int i = aY; i < aY + currentHeight; i += 128) - drawTexturedModalRect(aX - 5, i, 0, 5, 5, Math.min(128, aY + currentHeight - i)); // left - for (int i = aY; i < aY + currentHeight; i += 128) - drawTexturedModalRect(aX + currentWidth + 100, i, 171, 5, 5, Math.min(128, aY + currentHeight - i)); // right - - if (map.packet.ptype == 2) { - HashMap[][] fluidInfo = map.packet.map; - int tX = x - aX; - int tY = y - aY; - if (tX >= 0 && tY >= 0 && tX < fluidInfo.length && tY < fluidInfo[0].length) { - List info = new ArrayList<>(); - if (fluidInfo[tX][tY] != null) { - short fluidId = fluidInfo[tX][tY].get((byte) 1); - 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)); - info.add( - 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")); - } - func_146283_a(info, x, y); - } - } - } - -} diff --git a/src/main/java/com/detrav/gui/OresList.java b/src/main/java/com/detrav/gui/OresList.java deleted file mode 100644 index cc8f9b1baa..0000000000 --- a/src/main/java/com/detrav/gui/OresList.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.detrav.gui; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.function.BiConsumer; - -import net.minecraft.client.gui.GuiScreen; -import net.minecraft.client.renderer.Tessellator; - -import cpw.mods.fml.client.GuiScrollingList; - -class OresList extends GuiScrollingList { - - private final HashMap ores; - private final List keys; - private final GuiScreen parent; - private final BiConsumer onSelected; - private boolean invert = false; - - private int selected = -1; - - public OresList(GuiScreen parent, int width, int height, int top, int bottom, int left, int entryHeight, - HashMap aOres, BiConsumer 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); - if (keys.size() > 1) keys.add(0, "All"); - selected = 0; - } - - @Override - protected int getSize() { - return keys.size(); - } - - @Override - protected void elementClicked(int index, boolean doubleClick) { - selected = index; - if (doubleClick) this.invert = !this.invert; - - if (onSelected != null) onSelected.accept(keys.get(index), this.invert); - } - - @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 - 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 deleted file mode 100644 index 1659b9bffc..0000000000 --- a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java +++ /dev/null @@ -1,145 +0,0 @@ -package com.detrav.gui.textures; - -import java.awt.Color; -import java.awt.image.BufferedImage; -import java.awt.image.WritableRaster; - -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 com.detrav.net.ProspectingPacket; - -/** - * Created by wital_000 on 21.03.2016. - */ -public class DetravMapTexture extends AbstractTexture { - - public final ProspectingPacket packet; - private String selected = "All"; - public int width = -1; - public int height = -1; - public boolean invert = false; - - public DetravMapTexture(ProspectingPacket aPacket) { - packet = aPacket; - } - - private BufferedImage getImage() { - final int backgroundColor = invert ? Color.GRAY.getRGB() : Color.WHITE.getRGB(); - final 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, backgroundColor); - 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.getOrDefault(name, Color.BLACK.getRGB()) | 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) - && (selected.equals("All") || selected.equals(name))) { - image.setRGB(i, j, packet.ores.getOrDefault(name, Color.BLACK.getRGB()) | 0XFF000000); - } - } else if (packet.ptype == 3) { - final short meta = packet.map[i][j].get((byte) 1); - image.setRGB(i, j, ((meta & 0xFF) << 16) + ((meta & 0xFF) << 8) + ((meta & 0xFF)) | 0XFF000000); - } - } - // 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 resourceManager) { - this.deleteGlTexture(); - if (packet != null) { - int tId = getGlTextureId(); - if (tId < 0) return; - TextureUtil.uploadTextureImageAllocate(this.getGlTextureId(), getImage(), false, false); - width = packet.getSize(); - height = packet.getSize(); - } - } - - public void loadTexture(IResourceManager resourceManager, boolean invert) { - this.invert = invert; - loadTexture(resourceManager); - } - - public void loadTexture(IResourceManager resourceManager, String selected, boolean invert) { - this.selected = selected; - loadTexture(resourceManager, invert); - } - - public int glBindTexture() { - if (this.glTextureId < 0) return this.glTextureId; - GL11.glBindTexture(GL11.GL_TEXTURE_2D, this.getGlTextureId()); - return this.glTextureId; - } - - public void draw(int x, int y) { - float f = 1F / (float) width; - float f1 = 1F / (float) height; - 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)); - tessellator.addVertexWithUV( - (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)); - tessellator.draw(); - } - -} diff --git a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java b/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java deleted file mode 100644 index 2aa01f4fab..0000000000 --- a/src/main/java/com/detrav/items/DetravMetaGeneratedTool01.java +++ /dev/null @@ -1,360 +0,0 @@ -package com.detrav.items; - -import java.util.List; - -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; - -import com.detrav.DetravScannerMod; -import com.detrav.enums.DetravToolDictNames; -import com.detrav.items.tools.DetravProspector; -import com.detrav.items.tools.DetravToolElectricProspector; - -import gregtech.api.enums.GT_Values; -import gregtech.api.enums.Materials; -import gregtech.api.enums.TC_Aspects; -import gregtech.api.interfaces.IToolStats; -import gregtech.api.items.GT_MetaGenerated_Tool; - -/** - * Created by wital_000 on 19.03.2016. - */ -public class DetravMetaGeneratedTool01 extends GT_MetaGenerated_Tool { - - public static DetravMetaGeneratedTool01 INSTANCE; - - public DetravMetaGeneratedTool01() { - 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)); - 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)); - 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)); - 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)); - 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)); - 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)); - 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)); - 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)); - 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)); - 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)); - - 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)); - 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)); - 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)); - 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)); - setCreativeTab(DetravScannerMod.TAB_DETRAV); - } - - @SuppressWarnings("unchecked") - public void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) { - long tMaxDamage = getToolMaxDamage(aStack); - Materials tMaterial = getPrimaryMaterial(aStack); - IToolStats tStats = getToolStats(aStack); - int tOffset = aList.size(); - 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; - } - 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")); - aList.add( - tOffset + 6, - EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.3")); - aList.add( - tOffset + 7, - EnumChatFormatting.ITALIC + StatCollector.translateToLocal("tooltip.detrav.scanner.usage.4")); - } - - } - - public Long getToolGTDetravData(ItemStack aStack) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("GT.ToolStats"); - if (aNBT != null) return aNBT.getLong("DetravData"); - } - return 0L; - } - - public boolean setToolGTDetravData(ItemStack aStack, long data) { - NBTTagCompound aNBT = aStack.getTagCompound(); - if (aNBT != null) { - aNBT = aNBT.getCompoundTag("GT.ToolStats"); - if (aNBT != null) { - aNBT.setLong("DetravData", data); - return true; - } - } - return false; - } - - @SuppressWarnings("unchecked") - public void getDetravSubItems(Item item, CreativeTabs detravCreativeTab, List list) { - - ItemStack dStack; - if (DetravScannerMod.isDreamcraftLoaded) { - // Materials at tiers - 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 - 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 (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); - } else { - dStack = getToolWithStats( - 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 deleted file mode 100644 index d99a8ceec6..0000000000 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProspector.java +++ /dev/null @@ -1,253 +0,0 @@ -package com.detrav.items.behaviours; - -import java.util.ArrayList; -import java.util.List; - -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.fluids.FluidStack; - -import com.detrav.DetravScannerMod; -import com.detrav.items.DetravMetaGeneratedTool01; -import com.detrav.net.DetravNetwork; -import com.detrav.net.ProspectingPacket; -import com.detrav.utils.BartWorksHelper; -import com.detrav.utils.GTppHelper; -import com.sinthoras.visualprospecting.VisualProspecting_API; - -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; - -/** - * Created by wital_000 on 19.03.2016. - */ -public class BehaviourDetravToolElectricProspector extends BehaviourDetravToolProspector { - - public BehaviourDetravToolElectricProspector(int aCosts) { - super(aCosts); - } - - public ItemStack onItemRightClick(GT_MetaBase_Item aItem, ItemStack aStack, World aWorld, EntityPlayer aPlayer) { - if (!aWorld.isRemote) { - int data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack) - .intValue(); - if (aPlayer.isSneaking()) { - data++; - if (data > 3) data = 0; - switch (data) { - case 0: - aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.0"))); - break; - case 1: - aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.1"))); - break; - case 2: - aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.2"))); - break; - case 3: - aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.3"))); - break; - default: - aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.mode.error"))); - break; - } - DetravMetaGeneratedTool01.INSTANCE.setToolGTDetravData(aStack, (long) data); - return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); - } - - final DetravMetaGeneratedTool01 tool = (DetravMetaGeneratedTool01) aItem; - final int cX = ((int) aPlayer.posX) >> 4; - final int cZ = ((int) aPlayer.posZ) >> 4; - int size = aItem.getHarvestLevel(aStack, "") + 1; - final List chunks = new ArrayList<>(); - aPlayer.addChatMessage(new ChatComponentText("Scanning...")); - - for (int i = -size; i <= size; i++) - for (int j = -size; j <= size; j++) if (i != -size && i != size && j != -size && j != size) - chunks.add(aWorld.getChunkFromChunkCoords(cX + i, cZ + j)); - size = size - 1; - - final ProspectingPacket packet = new ProspectingPacket( - cX, - cZ, - (int) aPlayer.posX, - (int) aPlayer.posZ, - size, - data); - final String small_ore_keyword = StatCollector.translateToLocal("detrav.scanner.small_ore.keyword"); - for (Chunk c : chunks) { - for (int x = 0; x < 16; x++) for (int z = 0; z < 16; z++) { - final int ySize = c.getHeightValue(x, z); - for (int y = 1; y < ySize; y++) { - switch (data) { - case 0: - case 1: - final Block tBlock = c.getBlock(x, y, z); - short tMetaID = (short) c.getBlockMetadata(x, y, z); - if (tBlock instanceof GT_Block_Ores_Abstract) { - TileEntity tTileEntity = c.getTileEntityUnsafe(x, y, z); - if ((tTileEntity instanceof GT_TileEntity_Ores) - && ((GT_TileEntity_Ores) tTileEntity).mNatural) { - tMetaID = (short) ((GT_TileEntity_Ores) tTileEntity).getMetaData(); - try { - String name = GT_LanguageManager - .getTranslation(tBlock.getUnlocalizedName() + "." + tMetaID + ".name"); - if (data != 1 && name.startsWith(small_ore_keyword)) continue; - packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, tMetaID); - } catch (Exception e) { - String name = tBlock.getUnlocalizedName() + "."; - if (data != 1 && name.contains(".small.")) continue; - packet.addBlock(c.xPosition * 16 + x, y, c.zPosition * 16 + z, tMetaID); - } - } - } else if (DetravScannerMod.isGTppLoaded && GTppHelper.isGTppBlock(tBlock)) { - packet.addBlock( - c.xPosition * 16 + x, - y, - c.zPosition * 16 + z, - GTppHelper.getGTppMeta(tBlock)); - } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)) { - if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue; - packet.addBlock( - c.xPosition * 16 + x, - y, - c.zPosition * 16 + z, - BartWorksHelper.getMetaFromBlock(c, x, y, z, tBlock)); - } else if (data == 1) { - ItemData tAssotiation = GT_OreDictUnificator - .getAssociation(new ItemStack(tBlock, 1, tMetaID)); - if ((tAssotiation != null) && (tAssotiation.mPrefix.toString() - .startsWith("ore"))) { - packet.addBlock( - c.xPosition * 16 + x, - y, - c.zPosition * 16 + z, - (short) tAssotiation.mMaterial.mMaterial.mMetaItemSubID); - } - } - break; - case 2: - if ((x == 0) || (z == 0)) { // Skip doing the locations with the grid on them. - break; - } - FluidStack fStack = GT_UndergroundOil.undergroundOil( - aWorld.getChunkFromBlockCoords(c.xPosition * 16 + x, c.zPosition * 16 + z), - -1); - if (fStack.amount > 0) { - packet.addBlock( - c.xPosition * 16 + x, - 1, - c.zPosition * 16 + z, - (short) fStack.getFluidID()); - packet - .addBlock(c.xPosition * 16 + x, 2, c.zPosition * 16 + z, (short) fStack.amount); - } - break; - case 3: - float polution = (float) getPolution( - aWorld, - c.xPosition * 16 + x, - c.zPosition * 16 + z); - polution /= 2000000; - polution *= -0xFF; - if (polution > 0xFF) polution = 0xFF; - polution = 0xFF - polution; - packet.addBlock(c.xPosition * 16 + x, 1, c.zPosition * 16 + z, (short) polution); - break; - } - if (data > 1) break; - } - } - } - packet.level = ((DetravMetaGeneratedTool01) aItem).getHarvestLevel(aStack, ""); - DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP) aPlayer); - if (!aPlayer.capabilities.isCreativeMode) tool.doDamage(aStack, this.mCosts * chunks.size()); - - 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<>()); - } 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)); - } - } - } - return super.onItemRightClick(aItem, aStack, aWorld, aPlayer); - } - - void addChatMassageByValue(EntityPlayer aPlayer, int value, String name) { - if (value < 0) { - aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name)); - } else if (value < 1) { - aPlayer - .addChatMessage(new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6"))); - } else aPlayer.addChatMessage( - new ChatComponentText(StatCollector.translateToLocal("detrav.scanner.found.texts.6") + name + " " + value)); - } - - public boolean onItemUse(GT_MetaBase_Item aItem, ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, - int aY, int aZ, int aSide, float hitX, float hitY, float hitZ) { - long data = DetravMetaGeneratedTool01.INSTANCE.getToolGTDetravData(aStack); - if (data < 2) { - if (aWorld.getBlock(aX, aY, aZ) == Blocks.bedrock) { - if (!aWorld.isRemote) { - FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1); - addChatMassageByValue(aPlayer, fStack.amount, fStack.getLocalizedName()); - if (!aPlayer.capabilities.isCreativeMode) - ((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts); - } - return true; - } else { - if (!aWorld.isRemote) { - prospectSingleChunk((DetravMetaGeneratedTool01) aItem, aStack, aPlayer, aWorld, aX, aY, aZ); - } - return true; - } - } - if (data < 3) if (!aWorld.isRemote) { - FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1); - addChatMassageByValue(aPlayer, fStack.amount, fStack.getLocalizedName()); - if (!aPlayer.capabilities.isCreativeMode) ((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts); - return true; - } - if (!aWorld.isRemote) { - int polution = getPolution(aWorld, aX, aZ); - addChatMassageByValue(aPlayer, polution, "Pollution"); - } - return true; - } - -} diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java deleted file mode 100644 index 66ef237593..0000000000 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java +++ /dev/null @@ -1,421 +0,0 @@ -package com.detrav.items.behaviours; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.SplittableRandom; - -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; -import net.minecraft.world.chunk.Chunk; -import net.minecraftforge.fluids.FluidStack; - -import com.detrav.DetravScannerMod; -import com.detrav.items.DetravMetaGeneratedTool01; -import com.detrav.utils.BartWorksHelper; -import com.detrav.utils.GTppHelper; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; -import com.sinthoras.visualprospecting.VisualProspecting_API; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.registry.LanguageRegistry; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -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_Pollution; -import gregtech.common.GT_UndergroundOil; -import gregtech.common.blocks.GT_Block_Ores_Abstract; -import gregtech.common.blocks.GT_TileEntity_Ores; -import gregtech.common.items.behaviors.Behaviour_None; - -/** - * Created by wital_000 on 19.03.2016. - */ -public class BehaviourDetravToolProspector extends Behaviour_None { - - static final int[] DISTANCEINTS = new int[] { 0, 4, 25, 64 }; - int distTextIndex; - - HashMap ores; - int badluck; - - protected final int mCosts; - - static final String CHAT_MSG_SEPARATOR = "--------------------"; - - public BehaviourDetravToolProspector(int aCosts) { - mCosts = aCosts; - } - - 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) { - - SplittableRandom aRandom = new SplittableRandom(); - int chance = ((1 + aStack.getItemDamage()) * 8) > 100 ? 100 : (1 + aStack.getItemDamage()) * 8; - - if (aWorld.isRemote) return false; - - if (aWorld.getBlock(aX, aY, aZ) == Blocks.bedrock) { - if (!aWorld.isRemote && aRandom.nextInt(100) < chance) { - FluidStack fStack = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1); - addChatMassageByValue(aPlayer, fStack.amount / 2, "a Fluid");// fStack.getLocalizedName()); - /* - * boolean fluid = GT_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1)!=null - * &>_UndergroundOil.undergroundOil(aWorld.getChunkFromBlockCoords(aX, aZ), -1).getFluid()!=null; if - * (fluid) aPlayer.addChatMessage(new - * ChatComponentText(EnumChatFormatting.GREEN+"You found some liquid.")); else - * aPlayer.addChatMessage(new ChatComponentText(EnumChatFormatting.RED+"You found no liquid.")); - */ - if (!aPlayer.capabilities.isCreativeMode) - ((DetravMetaGeneratedTool01) aItem).doDamage(aStack, this.mCosts); - - if (Loader.isModLoaded("visualprospecting")) { - VisualProspecting_API.LogicalServer.sendProspectionResultsToClient( - (EntityPlayerMP) aPlayer, - new ArrayList<>(), - VisualProspecting_API.LogicalServer - .prospectUndergroundFluidsWithingRadius(aWorld, (int) aPlayer.posX, (int) aPlayer.posZ, 0)); - } - } - return true; - } - if (aWorld.getBlock(aX, aY, aZ) - .getMa