diff --git a/src/main/java/gregtech/api/gui/widgets/SlotWidget.java b/src/main/java/gregtech/api/gui/widgets/SlotWidget.java index 1d72ce11d5a..dc60d37a59a 100644 --- a/src/main/java/gregtech/api/gui/widgets/SlotWidget.java +++ b/src/main/java/gregtech/api/gui/widgets/SlotWidget.java @@ -67,13 +67,14 @@ protected Slot createSlot(IItemHandler itemHandler, int index) { @Override @SideOnly(Side.CLIENT) public void drawInBackground(int mouseX, int mouseY, IRenderContext context) { - if (isEnabled() && backgroundTexture != null) { + if (isEnabled()) { Position pos = getPosition(); Size size = getSize(); - for (IGuiTexture backgroundTexture : this.backgroundTexture) { - backgroundTexture.draw(pos.x, pos.y, size.width, size.height); + if (backgroundTexture != null) { + for (IGuiTexture backgroundTexture : this.backgroundTexture) { + backgroundTexture.draw(pos.x, pos.y, size.width, size.height); + } } - RenderHelper.enableGUIStandardItemLighting(); GlStateManager.pushMatrix(); RenderItem itemRender = Minecraft.getMinecraft().getRenderItem(); diff --git a/src/main/java/gregtech/api/net/SProspectingPacket.java b/src/main/java/gregtech/api/net/SProspectingPacket.java new file mode 100644 index 00000000000..8fc6599b70f --- /dev/null +++ b/src/main/java/gregtech/api/net/SProspectingPacket.java @@ -0,0 +1,105 @@ +package gregtech.api.net; + +import net.minecraft.network.PacketBuffer; + +import java.util.HashMap; +import java.util.HashSet; +import java.util.Set; + +public class SProspectingPacket { + public int chunkX; + public int chunkZ; + public int posX; + public int posZ; + public int mode; + public HashMap[][] map; + public Set ores; + + public SProspectingPacket(int chunkX, int chunkZ, int posX, int posZ, int mode) { + this.chunkX = chunkX; + this.chunkZ = chunkZ; + this.posX = posX; + this.posZ = posZ; + this.mode = mode; + if (mode == 1) + map = new HashMap[1][1]; + else + map = new HashMap[16][16]; + + ores = new HashSet<>(); + } + + public static SProspectingPacket readPacketData(PacketBuffer buffer) { + SProspectingPacket packet = new SProspectingPacket(buffer.readInt(), buffer.readInt(), buffer.readInt(), buffer.readInt(), buffer.readInt()); + int aSize = 0; + if (packet.mode == 0) + aSize = 16; + else if (packet.mode == 1) + aSize = 1; + int checkOut = 0; + for (int i = 0; i < aSize; i++) + for (int j = 0; j < aSize; j++) { + byte kSize = buffer.readByte(); + if (kSize == 0) continue; + packet.map[i][j] = new HashMap<>(); + for (int k = 0; k < kSize; k++) { + byte y = buffer.readByte(); + String name = buffer.readString(1000); + packet.map[i][j].put(y, name); + if (packet.mode != 1 || y == 1) + packet.ores.add(name); + checkOut++; + } + } + int checkOut2 = buffer.readInt(); + if (checkOut != checkOut2) { + return null; + } + return packet; + } + + public void writePacketData(PacketBuffer buffer) { + buffer.writeInt(chunkX); + buffer.writeInt(chunkZ); + buffer.writeInt(posX); + buffer.writeInt(posZ); + buffer.writeInt(mode); + int aSize = 0; + if (this.mode == 0) + aSize = 16; + else if (this.mode == 1) + aSize = 1; + int checkOut = 0; + for (int i = 0; i < aSize; i++) + for (int j = 0; j < aSize; j++) { + if (map[i][j] == null) + buffer.writeByte(0); + else { + buffer.writeByte(map[i][j].keySet().size()); + for (byte key : map[i][j].keySet()) { + buffer.writeByte(key); + buffer.writeString(map[i][j].get(key)); + checkOut++; + } + } + } + buffer.writeInt(checkOut); + } + + public void addBlock(int x, int y, int z, String orePrefix) { + if (this.mode == 0) { + if (map[x][z] == null) + map[x][z] = new HashMap<>(); + map[x][z].put((byte) y, orePrefix); + ores.add(orePrefix); + } else if (this.mode == 1) { + if (map[x][z] == null) + map[x][z] = new HashMap<>(); + map[x][z].put((byte) y, orePrefix); + if (y == 1) { + ores.add(orePrefix); + } + } + } + +} diff --git a/src/main/java/gregtech/api/terminal/TerminalRegistry.java b/src/main/java/gregtech/api/terminal/TerminalRegistry.java index d0f1a7303c9..21d83e7651e 100644 --- a/src/main/java/gregtech/api/terminal/TerminalRegistry.java +++ b/src/main/java/gregtech/api/terminal/TerminalRegistry.java @@ -8,6 +8,7 @@ import gregtech.common.terminal.app.guide.SimpleMachineGuideApp; import gregtech.common.terminal.app.guide.TutorialGuideApp; import gregtech.common.terminal.app.guideeditor.GuideEditorApp; +import gregtech.common.terminal.app.prospector.OreProspectorApp; import gregtech.common.terminal.app.recipechart.RecipeChartApp; import java.util.*; @@ -23,6 +24,7 @@ public static void init() { registerApp(new TutorialGuideApp(), true); registerApp(new GuideEditorApp(), true); registerApp(new ThemeSettingApp(), true); + registerApp(new OreProspectorApp(), true); if (GTValues.isModLoaded(GTValues.MODID_JEI)) { registerApp(new RecipeChartApp(), true); } diff --git a/src/main/java/gregtech/api/terminal/gui/widgets/DraggableScrollableWidgetGroup.java b/src/main/java/gregtech/api/terminal/gui/widgets/DraggableScrollableWidgetGroup.java index 6d28f4efb82..ec44850444c 100644 --- a/src/main/java/gregtech/api/terminal/gui/widgets/DraggableScrollableWidgetGroup.java +++ b/src/main/java/gregtech/api/terminal/gui/widgets/DraggableScrollableWidgetGroup.java @@ -273,7 +273,7 @@ else if (yBarWidth > 0 && isOnYScrollPane(mouseX, mouseY)) { return false; } - private boolean checkClickedDragged(int mouseX, int mouseY, int button) { + protected boolean checkClickedDragged(int mouseX, int mouseY, int button) { draggedWidget = null; for (int i = widgets.size() - 1; i >= 0; i--) { Widget widget = widgets.get(i); diff --git a/src/main/java/gregtech/api/terminal/os/TerminalDesktopWidget.java b/src/main/java/gregtech/api/terminal/os/TerminalDesktopWidget.java index 0cd106e3bc6..47bba6704fc 100644 --- a/src/main/java/gregtech/api/terminal/os/TerminalDesktopWidget.java +++ b/src/main/java/gregtech/api/terminal/os/TerminalDesktopWidget.java @@ -20,7 +20,7 @@ public TerminalDesktopWidget(Position position, Size size, TerminalOSWidget os) public void installApplication(AbstractApplication application){ int r = 12; int index = appDiv.widgets.size(); - int x = this.getSize().width / 2 + (3 * r) * (index - 3); + int x = this.getSize().width / 2 + (3 * r) * (index % 7 - 3); int y = (index / 7) * (3 * r) + 40; CircleButtonWidget button = new CircleButtonWidget(x,y) .setColors(TerminalTheme.COLOR_B_2.getColor(), diff --git a/src/main/java/gregtech/api/unification/OreDictUnifier.java b/src/main/java/gregtech/api/unification/OreDictUnifier.java index 683703216fb..0a0bef5300a 100644 --- a/src/main/java/gregtech/api/unification/OreDictUnifier.java +++ b/src/main/java/gregtech/api/unification/OreDictUnifier.java @@ -10,6 +10,7 @@ import gregtech.api.unification.stack.*; import gregtech.api.util.CustomModPriorityComparator; import gregtech.common.ConfigHolder; +import net.minecraft.block.Block; import net.minecraft.item.ItemStack; import net.minecraft.util.NonNullList; import net.minecraftforge.common.MinecraftForge; @@ -200,6 +201,10 @@ public static OrePrefix getPrefix(ItemStack itemStack) { return null; } + public static OrePrefix getPrefix(Block block) { + return getPrefix(new ItemStack(block)); + } + @Nullable public static UnificationEntry getUnificationEntry(ItemStack itemStack) { if (itemStack.isEmpty()) return null; diff --git a/src/main/java/gregtech/common/terminal/app/prospector/OreProspectorApp.java b/src/main/java/gregtech/common/terminal/app/prospector/OreProspectorApp.java new file mode 100644 index 00000000000..44c37d35697 --- /dev/null +++ b/src/main/java/gregtech/common/terminal/app/prospector/OreProspectorApp.java @@ -0,0 +1,80 @@ +package gregtech.common.terminal.app.prospector; + +import gregtech.api.gui.GuiTextures; +import gregtech.api.gui.widgets.ImageWidget; +import gregtech.api.terminal.app.AbstractApplication; +import gregtech.api.terminal.os.TerminalOSWidget; +import gregtech.api.terminal.os.TerminalTheme; +import gregtech.api.terminal.os.menu.IMenuComponent; +import gregtech.common.terminal.app.prospector.widget.WidgetOreList; +import gregtech.common.terminal.app.prospector.widget.WidgetProspectingMap; +import gregtech.common.terminal.component.ClickComponent; +import gregtech.common.terminal.component.SearchComponent; +import net.minecraft.nbt.NBTTagCompound; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.function.Consumer; + +public class OreProspectorApp extends AbstractApplication implements + SearchComponent.IWidgetSearch { + WidgetOreList widgetOreList; + WidgetProspectingMap widgetProspectingMap; + + public OreProspectorApp() { + super("ore_prospector", GuiTextures.SCANNER_OVERLAY); + } + + @Override + public AbstractApplication createApp(TerminalOSWidget os, boolean isClient, NBTTagCompound nbt) { //333, 232 + OreProspectorApp app = new OreProspectorApp(); + app.addWidget(new ImageWidget(0, 0, 333, 232, TerminalTheme.COLOR_B_2)); + int chunkRadius = 7; + int offset = (232 - 32 * 7 + 16) / 2; + if (isClient) { + app.widgetOreList = new WidgetOreList(32 * chunkRadius - 16, offset, 333 - 32 * chunkRadius + 16, 232 - 2 * offset); + app.addWidget(app.widgetOreList); + } + app.widgetProspectingMap = new WidgetProspectingMap(0, offset, chunkRadius, app.widgetOreList, 0, 1); + app.addWidget(1, app.widgetProspectingMap); + return app; + } + + @Override + public List getMenuComponents() { + ClickComponent darkMode = new ClickComponent().setIcon(GuiTextures.ICON_VISIBLE).setHoverText("terminal.prospector.vis_mode").setClickConsumer(cd->{ + if (cd.isClient) { + widgetProspectingMap.setDarkMode(!widgetProspectingMap.getDarkMode()); + } + }); + return Arrays.asList(darkMode, new SearchComponent<>(this)); + } + + @Override + public String resultDisplay(String result) { + if (widgetOreList != null) { + return widgetOreList.ores.get(result); + } + return ""; + } + + @Override + public void selectResult(String result) { + if (widgetOreList != null) { + widgetOreList.setSelected(result); + } + } + + @Override + public void search(String word, Consumer find) { + if (widgetOreList != null) { + word = word.toLowerCase(); + for (Map.Entry entry : widgetOreList.ores.entrySet()) { + if (entry.getKey().toLowerCase().contains(word) || entry.getValue().toLowerCase().contains(word)) { + find.accept(entry.getKey()); + } + } + } + } +} diff --git a/src/main/java/gregtech/common/terminal/app/prospector/ProspectingTexture.java b/src/main/java/gregtech/common/terminal/app/prospector/ProspectingTexture.java new file mode 100644 index 00000000000..52cbf2587f5 --- /dev/null +++ b/src/main/java/gregtech/common/terminal/app/prospector/ProspectingTexture.java @@ -0,0 +1,142 @@ +package gregtech.common.terminal.app.prospector; + +import gregtech.api.gui.resources.RenderUtil; +import gregtech.api.net.SProspectingPacket; +import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.stack.MaterialStack; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.renderer.texture.AbstractTexture; +import net.minecraft.client.renderer.texture.TextureUtil; +import net.minecraft.client.resources.IResourceManager; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import javax.annotation.Nullable; +import java.awt.*; +import java.awt.image.BufferedImage; +import java.awt.image.WritableRaster; +import java.util.HashMap; + + +public class ProspectingTexture extends AbstractTexture { + + private String selected = "[all]"; + private boolean darkMode = false; + private int imageWidth = -1; + private int imageHeight = -1; + public final HashMap[][] map; + public static HashMap emptyTag = new HashMap<>(); + private int playerI; + private int playerJ; + private final int mode; + private final int radius; + + public ProspectingTexture(int mode, int radius) { + this.radius = radius; + this.mode = mode; + if (this.mode == 1) + map = new HashMap[(radius * 2 - 1)][(radius * 2 - 1)]; + else + map = new HashMap[(radius * 2 - 1) * 16][(radius * 2 - 1) * 16]; + } + + public void updateTexture(SProspectingPacket packet) { + int playerChunkX = packet.posX >> 4; + int playerChunkZ = packet.posZ >> 4; + playerI = packet.posX - (playerChunkX - this.radius + 1) * 16 - 1; + playerJ = packet.posZ - (playerChunkZ - this.radius + 1) * 16 - 1; + if (this.mode == 1) { + map[packet.chunkX - (playerChunkX - radius + 1)][packet.chunkZ - (playerChunkZ - radius + 1)] = packet.map[0][0] == null ? + emptyTag : packet.map[0][0]; + } else { + for (int x = 0; x < 16; x++) { + for (int z = 0; z < 16; z++) { + map[x + (packet.chunkX - (playerChunkX - radius) - 1) * 16][z + (packet.chunkZ - (playerChunkZ - radius) - 1) * 16] = packet.map[x][z] == null ? + emptyTag : packet.map[x][z]; + } + } + } + loadTexture(null); + } + + private BufferedImage getImage() { + int wh = (this.radius * 2 - 1) * 16; + BufferedImage image = new BufferedImage(wh, wh, BufferedImage.TYPE_INT_ARGB); + WritableRaster raster = image.getRaster(); + + for (int i = 0; i < wh; i++){ + for (int j = 0; j < wh; j++) { + HashMap data = this.map[this.mode == 0 ? i : i / 16][this.mode == 0 ? j : j / 16]; + // draw bg + image.setRGB(i, j, ((data == null) ^ darkMode) ? Color.darkGray.getRGB(): Color.WHITE.getRGB()); + //draw ore + if (this.mode == 0 && data != null) { + for (String orePrefix : data.values()) { + if (!selected.equals("[all]") && !selected.equals(orePrefix)) continue; + MaterialStack mterialStack = OreDictUnifier.getMaterial(OreDictUnifier.get(orePrefix)); + image.setRGB(i, j, mterialStack==null? orePrefix.hashCode():mterialStack.material.getMaterialRGB() | 0XFF000000); + break; + } + } + // 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(@Nullable IResourceManager resourceManager) { + this.deleteGlTexture(); + int tId = getGlTextureId(); + if (tId < 0) return; + TextureUtil.uploadTextureImageAllocate(this.getGlTextureId(), getImage(), false, false); + imageWidth = (radius * 2 - 1) * 16; + imageHeight = (radius * 2 - 1) * 16; + } + + public void loadTexture(@Nullable IResourceManager resourceManager, String selected){ + this.selected = selected; + loadTexture(resourceManager); + } + + public void loadTexture(@Nullable IResourceManager resourceManager, boolean darkMode){ + this.darkMode = darkMode; + loadTexture(resourceManager); + } + + public String getSelected() { + return selected; + } + + public void draw(int x, int y) { + if(this.glTextureId < 0) return; + GlStateManager.bindTexture(this.getGlTextureId()); + Gui.drawModalRectWithCustomSizedTexture(x, y, 0, 0, imageWidth, imageHeight, imageWidth, imageHeight); + if(this.mode == 1) { // draw fluids in grid + for (int cx = 0; cx < this.radius * 2 - 1; cx++){ + for (int cz = 0; cz < this.radius * 2 - 1; cz++){ + if (this.map[cx][cz] != null && !this.map[cx][cz].isEmpty()) { + Fluid fluid = FluidRegistry.getFluid(this.map[cx][cz].get((byte) 1)); + if (selected.equals("[all]") || selected.equals(fluid.getName())) { + RenderUtil.drawFluidForGui(new FluidStack(fluid, 1), 1, x + cx * 16 + 1, y + cz * 16 + 1, 16, 16); + } + } + } + } + } + } + +} diff --git a/src/main/java/gregtech/common/terminal/app/prospector/widget/WidgetOreList.java b/src/main/java/gregtech/common/terminal/app/prospector/widget/WidgetOreList.java new file mode 100644 index 00000000000..fdfa2bb52ff --- /dev/null +++ b/src/main/java/gregtech/common/terminal/app/prospector/widget/WidgetOreList.java @@ -0,0 +1,190 @@ +package gregtech.common.terminal.app.prospector.widget; + +import com.google.common.collect.BiMap; +import com.google.common.collect.HashBiMap; +import gregtech.api.gui.GuiTextures; +import gregtech.api.gui.IRenderContext; +import gregtech.api.gui.Widget; +import gregtech.api.gui.widgets.*; +import gregtech.api.terminal.gui.widgets.DraggableScrollableWidgetGroup; +import gregtech.api.terminal.os.TerminalTheme; +import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.stack.MaterialStack; +import gregtech.api.util.Position; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.fluids.FluidTank; +import net.minecraftforge.items.ItemStackHandler; + +import java.util.*; +import java.util.function.Consumer; + +import static gregtech.api.gui.impl.ModularUIGui.*; + +public class WidgetOreList extends DraggableScrollableWidgetGroup { + protected WidgetGroup selected; + protected final BiMap widgetMap; + protected Consumer onSelected = null; + public Map ores; + private int tickCounter; + + public WidgetOreList(int xPosition, int yPosition, int width, int slotSize) { + super(xPosition, yPosition, width, slotSize); + widgetMap = HashBiMap.create(); + ores = new HashMap<>(); + this.setYScrollBarWidth(5); + this.setYBarStyle(null, TerminalTheme.COLOR_F_1); + clear(); + } + + public void setSelected(String oreName) { + WidgetGroup widget = widgetMap.inverse().get(oreName); + if (widget != null) { + this.selected = widget; + if (this.onSelected != null) { + onSelected.accept(widgetMap.get(this.selected)); + } + } + } + + public void addOres(Set ores, int mode) { + switch (mode) { + case 0: + ores.stream().sorted().forEach(this::addOre); + break; + case 1: + ores.stream().sorted().forEach(this::addOil); + break; + default: + break; + } + } + + private void addOre(String orePrefix) { + if (ores.containsKey(orePrefix)) { + return; + } + ItemStack itemStack = OreDictUnifier.get(orePrefix); + if (itemStack == null || itemStack.isEmpty()) return; + ores.put(orePrefix, itemStack.getDisplayName()); + MaterialStack materialStack = OreDictUnifier.getMaterial(OreDictUnifier.get(orePrefix)); + ItemStackHandler itemStackHandler = new ItemStackHandler(1); + itemStackHandler.insertItem(0, itemStack, false); + WidgetGroup widgetGroup = new WidgetGroup(0, 0, getSize().width - 5, 18); + widgetGroup.addWidget(new SlotWidget(itemStackHandler, 0, 0, 0, false, false)); + widgetGroup.addWidget(new LabelWidget(20, 5, itemStack.getDisplayName(), materialStack==null? orePrefix.hashCode():materialStack.material.getMaterialRGB() | 0XFF000000)); + addOrePrefix(orePrefix, widgetGroup); + } + + private void addOrePrefix(String orePrefix, WidgetGroup widgetGroup) { + widgetMap.put(widgetGroup, orePrefix); + this.addWidget(widgetGroup); + this.widgets.sort(Comparator.comparing(widgetMap::get)); + int y = 0; + for (Widget widget : this.widgets) { + widget.setSelfPosition(new Position(0, y - scrollYOffset)); + y += 18; + } + computeMax(); + } + + private void addOil(String orePrefix) { + if (ores.containsKey(orePrefix)) { + return; + } + FluidStack fluidStack = FluidRegistry.getFluidStack(orePrefix, 1); + if (fluidStack == null) return; + ores.put(orePrefix, fluidStack.getLocalizedName()); + FluidTank fluidTank = new FluidTank(1); + fluidTank.setCanFill(false); + fluidTank.fillInternal(fluidStack, true); + WidgetGroup widgetGroup = new WidgetGroup(0, 0, getSize().width - 5, 18); + widgetGroup.addWidget(new TankWidget(fluidTank, 0, 0, 18, 18) + .setAlwaysShowFull(true) + .setHideTooltip(true) + .setContainerClicking(false, false)); + widgetGroup.addWidget(new LabelWidget(20, 5, fluidStack.getLocalizedName(), getFluidColor(fluidStack.getFluid()))); + addOrePrefix(orePrefix, widgetGroup); + } + + public void clear() { + this.clearAllWidgets(); + widgetMap.clear(); + WidgetGroup widgetGroup = new WidgetGroup(0, 0, getSize().width - 5, 18); + widgetGroup.addWidget(new ImageWidget(0, 0, 18, 18, GuiTextures.LOCK)); + widgetGroup.addWidget(new LabelWidget(20, 9, "terminal.prospector.list", -1)); + selected = widgetGroup; + widgetMap.put(widgetGroup, "[all]"); + this.addWidget(widgetGroup); + } + + @Override + protected boolean hookDrawInBackground(int mouseX, int mouseY, float partialTicks, IRenderContext context) { + for (Widget widget : widgets) { + if (widget.isVisible()) { + widget.drawInBackground(mouseX, mouseY, partialTicks, context); + } + } + GlStateManager.color(rColorForOverlay, gColorForOverlay, bColorForOverlay, 1.0F); + if (selected != null) { + drawSolidRect(selected.getPosition().x, selected.getPosition().y, selected.getSize().width, 18, 0x4BFFFFFF); + } + return true; + } + + @Override + protected boolean checkClickedDragged(int mouseX, int mouseY, int button) { + draggedWidget = null; + for (int i = widgets.size() - 1; i >= 0; i--) { + Widget widget = widgets.get(i); + if(widget.isVisible() && widget instanceof WidgetGroup) { + if(widget.isMouseOverElement(mouseX, mouseY)) { + if (isMouseOverElement(mouseX, mouseY) && this.selected != widget) { + this.setSelected(widgetMap.get(widget)); + } + return true; + } + } + } + return false; + } + + @Override + public void updateScreen() { + super.updateScreen(); + tickCounter++; + if (tickCounter % 20 == 0) { + widgets.forEach(widget -> { + if (widget instanceof WidgetGroup) { + Widget widget1 = ((WidgetGroup) widget).getContainedWidgets(true).get(0); + if (widget1 instanceof SlotWidget){ + SlotWidget slotWidget = (SlotWidget) widget1; + List list = OreDictUnifier.getAllWithOreDictionaryName(widgetMap.get(widget)); + if (list.size() > 0 ) { + slotWidget.getHandle().decrStackSize(64); + slotWidget.getHandle().putStack(list.get(Math.floorMod(tickCounter / 20, list.size()))); + } + } + } + + }); + } + } + + public static int getFluidColor(Fluid fluid) { + if (fluid == FluidRegistry.WATER) { + return 3183823; + } else { + return fluid == FluidRegistry.LAVA ? 16766720 : fluid.getColor(); + } + } + + @Override + protected void writeClientAction(int id, Consumer packetBufferWriter) { + + } +} diff --git a/src/main/java/gregtech/common/terminal/app/prospector/widget/WidgetProspectingMap.java b/src/main/java/gregtech/common/terminal/app/prospector/widget/WidgetProspectingMap.java new file mode 100644 index 00000000000..56c8df2155f --- /dev/null +++ b/src/main/java/gregtech/common/terminal/app/prospector/widget/WidgetProspectingMap.java @@ -0,0 +1,195 @@ +package gregtech.common.terminal.app.prospector.widget; + +import gregtech.api.gui.IRenderContext; +import gregtech.api.gui.Widget; +import gregtech.api.net.SProspectingPacket; +import gregtech.api.unification.OreDictUnifier; +import gregtech.api.unification.material.info.MaterialIconType; +import gregtech.api.unification.ore.OrePrefix; +import gregtech.api.util.Position; +import gregtech.api.util.Size; +import gregtech.common.terminal.app.prospector.ProspectingTexture; +import net.minecraft.block.Block; +import net.minecraft.client.gui.Gui; +import net.minecraft.client.renderer.GlStateManager; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.network.PacketBuffer; +import net.minecraft.world.World; +import net.minecraft.world.chunk.Chunk; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fml.common.FMLCommonHandler; +import net.minecraftforge.fml.relauncher.Side; +import net.minecraftforge.fml.relauncher.SideOnly; + +import java.awt.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +public class WidgetProspectingMap extends Widget { + private final int chunkRadius; + private final WidgetOreList oreList; + private final int mode; + private final int scanTick; + private boolean darkMode = false; + private int chunkIndex = 0; + @SideOnly(Side.CLIENT) + private ProspectingTexture texture; + + public WidgetProspectingMap(int xPosition, int yPosition, int chunkRadius, WidgetOreList widgetOreList, int mode, int scanTick) { + super(new Position(xPosition, yPosition), new Size(16 * (chunkRadius * 2 - 1), 16 * (chunkRadius * 2 - 1))); + this.chunkRadius = chunkRadius; + this.mode = mode; + this.scanTick = scanTick; + oreList = widgetOreList; + if (oreList != null) { + oreList.onSelected = name->{ + if (texture != null) { + texture.loadTexture(null, name); + } + }; + } + } + + @SideOnly(Side.CLIENT) + public void setDarkMode(boolean mode) { + if (darkMode != mode) { + darkMode = mode; + if (texture != null) { + texture.loadTexture(null, darkMode); + } + } + } + + @SideOnly(Side.CLIENT) + public boolean getDarkMode() { + return darkMode; + } + + @Override + public void detectAndSendChanges() { + EntityPlayer player = gui.entityPlayer; + World world = player.world; + if (FMLCommonHandler.instance().getMinecraftServerInstance().getTickCounter() % scanTick == 0 && chunkIndex < (chunkRadius * 2 - 1) * (chunkRadius * 2 - 1)) { + int cX = ((int) player.posX) >> 4; + int cZ = ((int) player.posZ) >> 4; + int r = (int) Math.floor(Math.sqrt(chunkIndex)); + r = r / 2 + ((r % 2 == 0) ? 0 : 1); + int side = r == 0 ? 0 : (chunkIndex - (2 * r - 1) * (2 * r - 1)) / (2 * r); + int offset = r == 0 ? -1 : (chunkIndex - (2 * r - 1) * (2 * r - 1)) % (2 * r); + + int ox = side == 0 ? -r : side == 1 ? (offset - r + 1) : side == 2 ? r : -(offset - r + 1); + int oz = side == 3 ? r : side == 0 ? -(offset - r + 1) : side == 1 ? -r : (offset - r + 1); + + Chunk chunk = world.getChunk(cX + ox, cZ + oz); + SProspectingPacket packet = new SProspectingPacket(cX + ox, cZ + oz, (int) player.posX, (int) player.posZ, this.mode); + + switch (mode) { + case 0: + for (int x = 0; x < 16; x++) { + for (int z = 0; z < 16; z++) { + int ySize = chunk.getHeightValue(x, z); + for (int y = 1; y < ySize; y++) { + Block block = chunk.getBlockState(x, y, z).getBlock(); + OrePrefix orePrefix = OreDictUnifier.getPrefix(block); + if (orePrefix != null && orePrefix.materialIconType == MaterialIconType.ore) { + packet.addBlock(x, y, z, OreDictUnifier.getOreDictionaryNames(new ItemStack(block)).stream().findFirst().get()); + } + } + } + } + break; + case 1: + // TODO UNDERGROUND OIL IN THE FUTURE +// PumpjackHandler.OilWorldInfo fStack = PumpjackHandler.getOilWorldInfo(world, chunk.x, chunk.z); +// if (fStack != null && fStack.getType() != null) { +// packet.addBlock(0, 2, 0, fStack.current + ""); +// packet.addBlock(0, 1, 0, fStack.getType().fluid); +// } + break; + default: + break; + } + writeUpdateInfo(2, packet::writePacketData); +// if (oreList != null) { +// oreList.addOres(packet.ores, packet.mode); +// } + chunkIndex++; + } + } + + @SideOnly(Side.CLIENT) + @Override + public void drawInBackground(int mouseX, int mouseY, float partialTicks, IRenderContext context) { + if(texture !=null) { + GlStateManager.color(1,1,1,1); + texture.draw(this.getPosition().x, this.getPosition().y); + } + } + + @SideOnly(Side.CLIENT) + @Override + public void readUpdateInfo(int id, PacketBuffer buffer) { + super.readUpdateInfo(id, buffer); + if (id == 2) { + SProspectingPacket packet = SProspectingPacket.readPacketData(buffer); + if (packet != null) { + if (texture == null) { + texture = new ProspectingTexture(packet.mode, chunkRadius); + } + texture.updateTexture(packet); + if (oreList != null) { + oreList.addOres(packet.ores, packet.mode); + } + } + } + } + + @SideOnly(Side.CLIENT) + @Override + public void drawInForeground(int mouseX, int mouseY) { + // draw tooltips + if (this.isMouseOverElement(mouseX, mouseY) && texture != null) { + List tooltips = new ArrayList<>(); + int cX = (mouseX - this.getPosition().x) / 16; + int cZ = (mouseY - this.getPosition().y) / 16; + if (cX >= chunkRadius * 2 - 1 || cZ >= chunkRadius * 2 - 1) + return; + // draw hover layer + Gui.drawRect(cX * 16 + this.getPosition().x, + cZ * 16 + this.getPosition().y, + (cX + 1) * 16 + this.getPosition().x, + (cZ + 1) * 16 + this.getPosition().y, + new Color(0x4B6C6C6C, true).getRGB()); + if (this.mode == 0) { // draw ore + tooltips.add(I18n.format("terminal.prospector.ore")); + HashMap oreInfo = new HashMap<>(); + for (int i = 0; i < 16; i++) { + for (int j = 0; j < 16; j++) { + if (texture.map[cX * 16 + i][cZ * 16 + j] != null) { + texture.map[cX * 16 + i][cZ * 16 + j].values().forEach(dict -> { + String name = OreDictUnifier.get(dict).getDisplayName(); + if (texture.getSelected().equals("[all]") || texture.getSelected().equals(dict)) { + oreInfo.put(name, oreInfo.getOrDefault(name, 0) + 1); + } + }); + } + } + } + oreInfo.forEach((name, count)->tooltips.add(name + " --- " + count)); + } else if(this.mode == 1){ + tooltips.add(I18n.format("terminal.prospector.fluid")); + if (texture.map[cX][cZ] != null && !texture.map[cX][cZ].isEmpty()) { + String name = FluidRegistry.getFluidStack(texture.map[cX][cZ].get((byte) 1),1).getLocalizedName(); + if (texture.getSelected().equals("[all]") || texture.getSelected().equals(texture.map[cX][cZ].get((byte) 1))) { + tooltips.add(name + " --- " + texture.map[cX][cZ].get((byte) 2)); + } + } + } + this.drawHoveringText(ItemStack.EMPTY, tooltips, 300, mouseX, mouseY); + GlStateManager.color(1.0F, 1.0F, 1.0F); + } + } +} diff --git a/src/main/resources/assets/gregtech/lang/en_us.lang b/src/main/resources/assets/gregtech/lang/en_us.lang index 2b59e666ffe..ce0524ed831 100644 --- a/src/main/resources/assets/gregtech/lang/en_us.lang +++ b/src/main/resources/assets/gregtech/lang/en_us.lang @@ -3789,6 +3789,7 @@ gregtech.terminal.app_name.tutorials=Tutorials gregtech.terminal.app_name.theme_settings=Theme Settings gregtech.terminal.app_name.guide_editor=Guide Editor gregtech.terminal.app_name.recipe_chart=Recipe Chart +gregtech.terminal.app_name.ore_prospector=Ore Prospector texture.modify_gui_texture.missing=Missing Texture texture.url_texture.fail=Load Failed @@ -3841,3 +3842,8 @@ terminal.recipe_chart.visible=Visible terminal.recipe_chart.jei=JEI Focus terminal.recipe_chart.tier=Tier: terminal.recipe_chart.ratio=Ratio + +terminal.prospector.vis_mode=dark mode +terminal.prospector.list=All Resources +terminal.prospector.ore=Ore statistics +terminal.prospector.fluid=Fluid statistics diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/calendar_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/calendar_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/calendar_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/calendar_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/calendar_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/calendar_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/calendar_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/calendar_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/clock1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/clock1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/clock1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/clock1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/clock1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/clock1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/clock1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/clock1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/clock2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/clock2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/clock2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/clock2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/clock2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/clock2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/clock2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/clock2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/gmail-copy_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/gmail-copy_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/gmail-copy_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/gmail-copy_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/gmail-copy_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/gmail-copy_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/gmail-copy_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/gmail-copy_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/gmail2-copy_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/gmail2-copy_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/gmail2-copy_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/gmail2-copy_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/gmail2-copy_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/gmail2-copy_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/gmail2-copy_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/gmail2-copy_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/kontakts_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/kontakts_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/kontakts_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/kontakts_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/kontakts_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/kontakts_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/kontakts_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/kontakts_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail_open_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail_open_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail_open_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail_open_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail_open_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail_open_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail_open_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail_open_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail_sent_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail_sent_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail_sent_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail_sent_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail_sent_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail_sent_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/mail_sent_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/mail_sent_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg3_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg3_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg3_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg3_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg3_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg3_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg3_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg3_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/msg_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/msg_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/note1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/note1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/note1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/note1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/note1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/note1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/note1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/note1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/note2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/note2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/note2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/note2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/note2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/note2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/note2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/note2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/pen_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/pen_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/pen_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/pen_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/pen_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/pen_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/pen_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/pen_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/phone_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/phone_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/phone_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/phone_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/phone_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/phone_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/phone_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/phone_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/profiles_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/profiles_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/profiles_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/profiles_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/profiles_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/profiles_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/profiles_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/profiles_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/skype_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/skype_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/skype_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/skype_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/skype_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/skype_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/skype_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/skype_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/tasks_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/tasks_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/tasks_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/tasks_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/tasks_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/tasks_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/tasks_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/tasks_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/voicemail-12_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/voicemail-12_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/voicemail-12_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/voicemail-12_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/voicemail-12_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/voicemail-12_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/voicemail-12_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/voicemail-12_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/voicemaill_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/voicemaill_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/voicemaill_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/voicemaill_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/voicemaill_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/voicemaill_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Communicate/voicemaill_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/communicate/voicemaill_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/Camera_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/Camera_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/Camera_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/Camera_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/Camera_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/Camera_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/Camera_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/Camera_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/Champions_League_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/Champions_League_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/Champions_League_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/Champions_League_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/Champions_League_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/Champions_League_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/Champions_League_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/Champions_League_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/TV2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/TV2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/TV2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/TV2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/TV2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/TV2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/TV2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/TV2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/TV_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/TV_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/TV_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/TV_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/TV_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/TV_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/TV_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/TV_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/VideoRecorder_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/VideoRecorder_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/VideoRecorder_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/VideoRecorder_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/VideoRecorder_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/VideoRecorder_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/VideoRecorder_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/VideoRecorder_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/WMP_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/WMP_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/WMP_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/WMP_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/WMP_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/WMP_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/WMP_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/WMP_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/YT1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/YT1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/YT1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/YT1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/YT1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/YT1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/YT1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/YT1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/YT2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/YT2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/YT2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/YT2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/YT2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/YT2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/YT2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/YT2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/blank-cd_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/blank-cd_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/blank-cd_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/blank-cd_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/blank-cd_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/blank-cd_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/blank-cd_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/blank-cd_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/camera3_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/camera3_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/camera3_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/camera3_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/camera3_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/camera3_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/camera3_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/camera3_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/ea_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/ea_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/ea_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/ea_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/ea_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/ea_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/ea_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/ea_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/iTunes_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/iTunes_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/iTunes_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/iTunes_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/iTunes_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/iTunes_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/iTunes_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/iTunes_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/landskape_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/landskape_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/landskape_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/landskape_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/landskape_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/landskape_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/landskape_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/landskape_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/lastfm_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/lastfm_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/lastfm_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/lastfm_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/lastfm_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/lastfm_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/lastfm_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/lastfm_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/listen_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/listen_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/listen_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/listen_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/listen_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/listen_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/listen_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/listen_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/macro_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/macro_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/macro_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/macro_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/macro_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/macro_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/macro_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/macro_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/photo_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/photo_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/photo_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/photo_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/photo_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/photo_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/photo_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/photo_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/radio_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/radio_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/radio_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/radio_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/radio_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/radio_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/radio_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/radio_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/sound2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/sound2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/sound2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/sound2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/sound2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/sound2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/sound2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/sound2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/sound_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/sound_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/sound_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/sound_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/sound_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/sound_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/sound_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/sound_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/touch_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/touch_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/touch_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/touch_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/touch_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/touch_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/touch_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/touch_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/video_rec_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/video_rec_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/video_rec_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/video_rec_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/video_rec_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/video_rec_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/video_rec_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/video_rec_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/viewer_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/viewer_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/viewer_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/viewer_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/viewer_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/viewer_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/viewer_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/viewer_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/walkman_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/walkman_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/walkman_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/walkman_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/walkman_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/walkman_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/walkman_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/walkman_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/winamp_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/winamp_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/winamp_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/winamp_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/winamp_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/winamp_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/winamp_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/winamp_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune3_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune3_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune3_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune3_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune3_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune3_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Media/zune3_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/media/zune3_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Bing_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Bing_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Bing_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Bing_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Bing_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Bing_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Bing_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Bing_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/COMPAS2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/COMPAS2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/COMPAS2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/COMPAS2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/COMPAS2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/COMPAS2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/COMPAS2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/COMPAS2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Canada_flag_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Canada_flag_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Canada_flag_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Canada_flag_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Canada_flag_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Canada_flag_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Canada_flag_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Canada_flag_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/EAAA_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/EAAA_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/EAAA_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/EAAA_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/EAAA_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/EAAA_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/EAAA_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/EAAA_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/EU_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/EU_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/EU_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/EU_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/EU_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/EU_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/EU_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/EU_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/NSA_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/NSA_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/NSA_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/NSA_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/NSA_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/NSA_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/NSA_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/NSA_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Navteq1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Navteq1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Navteq1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Navteq1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Navteq1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Navteq1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Navteq1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Navteq1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/POI2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/POI2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/POI2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/POI2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/POI2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/POI2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/POI2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/POI2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Sattelite_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Sattelite_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Sattelite_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Sattelite_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Sattelite_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Sattelite_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/Sattelite_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/Sattelite_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/compas1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/compas1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/compas1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/compas1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/compas1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/compas1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/compas1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/compas1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/compas3_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/compas3_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/compas3_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/compas3_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/compas3_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/compas3_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/compas3_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/compas3_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/gmaps_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/gmaps_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/gmaps_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/gmaps_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/gmaps_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/gmaps_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/gmaps_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/gmaps_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/navigation_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/navigation_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/navigation_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/navigation_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/navigation_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/navigation_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/navigation_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/navigation_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/navteq_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/navteq_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/navteq_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/navteq_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/navteq_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/navteq_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/navteq_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/navteq_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/path_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/path_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/path_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/path_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/path_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/path_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/path_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/path_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/poi_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/poi_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/poi_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/poi_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/poi_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/poi_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/poi_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/poi_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/world1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/world1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/world1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/world1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/world1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/world1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/world1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/world1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/world_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/world_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/world_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/world_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/world_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/world_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Navigate/world_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/navigate/world_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/BT2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/BT2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/BT2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/BT2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/BT2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/BT2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/BT2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/BT2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Chrome_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Chrome_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Chrome_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Chrome_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Chrome_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Chrome_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Chrome_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Chrome_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Firefox_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Firefox_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Firefox_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Firefox_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Firefox_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Firefox_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Firefox_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Firefox_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Hand_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Hand_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Hand_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Hand_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Hand_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Hand_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/Hand_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/Hand_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/USB1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/USB1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/USB1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/USB1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/USB1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/USB1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/USB1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/USB1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/att2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/att2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/att2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/att2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/att2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/att2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/att2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/att2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/att_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/att_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/att_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/att_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/att_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/att_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/att_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/att_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/bt_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/bt_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/bt_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/bt_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/bt_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/bt_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/bt_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/bt_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/facebook2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/facebook2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/facebook2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/facebook2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/facebook2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/facebook2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/facebook2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/facebook2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/facebook_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/facebook_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/facebook_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/facebook_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/facebook_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/facebook_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/facebook_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/facebook_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/firefox2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/firefox2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/firefox2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/firefox2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/firefox2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/firefox2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/firefox2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/firefox2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/g-google_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/g-google_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/g-google_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/g-google_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/g-google_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/g-google_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/g-google_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/g-google_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/globul_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/globul_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/globul_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/globul_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/globul_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/globul_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/globul_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/globul_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/gmail2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/gmail2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/gmail2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/gmail2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/gmail2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/gmail2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/gmail2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/gmail2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/gmail_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/gmail_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/gmail_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/gmail_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/gmail_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/gmail_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/gmail_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/gmail_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/google_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/google_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/google_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/google_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/google_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/google_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/google_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/google_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/ie_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/ie_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/ie_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/ie_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/ie_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/ie_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/ie_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/ie_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/mtel_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/mtel_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/mtel_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/mtel_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/mtel_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/mtel_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/mtel_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/mtel_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/net3_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/net3_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/net3_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/net3_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/net3_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/net3_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/net3_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/net3_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/net_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/net_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/net_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/net_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/net_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/net_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/net_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/net_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/netw_conn_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/netw_conn_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/netw_conn_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/netw_conn_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/netw_conn_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/netw_conn_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/netw_conn_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/netw_conn_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/opera_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/opera_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/opera_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/opera_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/opera_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/opera_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/opera_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/opera_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/rss_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/rss_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/rss_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/rss_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/rss_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/rss_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/rss_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/rss_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/search_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/search_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/search_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/search_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/search_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/search_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/search_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/search_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal4_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal4_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal4_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal4_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal4_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal4_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal4_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal4_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/signal_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/signal_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/skype1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/skype1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/skype1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/skype1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/skype1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/skype1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/skype1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/skype1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/skype2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/skype2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/skype2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/skype2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/skype2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/skype2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/skype2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/skype2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/t-m_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/t-m_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/t-m_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/t-m_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/t-m_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/t-m_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/t-m_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/t-m_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter3_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter3_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter3_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter3_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter3_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter3_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/twitter3_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/twitter3_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/verizon_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/verizon_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/verizon_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/verizon_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/verizon_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/verizon_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/verizon_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/verizon_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vivacom_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vivacom_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vivacom_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vivacom_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vivacom_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vivacom_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vivacom_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vivacom_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone3_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone3_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone3_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone3_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone3_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone3_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/vodafone3_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/vodafone3_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/wi-fi_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/wi-fi_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/wi-fi_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/wi-fi_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/wi-fi_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/wi-fi_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/wi-fi_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/wi-fi_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/wifi-router_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/wifi-router_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/wifi-router_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/wifi-router_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/wifi-router_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/wifi-router_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Network/wifi-router_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/network/wifi-router_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Favs1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Favs1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Favs1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Favs1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Favs1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Favs1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Favs1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Favs1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/LIBRARY_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/LIBRARY_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/LIBRARY_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/LIBRARY_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/LIBRARY_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/LIBRARY_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/LIBRARY_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/LIBRARY_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Llama_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Llama_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Llama_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Llama_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Llama_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Llama_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Llama_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Llama_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/MB_0027_LIBRARY_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/MB_0027_LIBRARY_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/MB_0027_LIBRARY_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/MB_0027_LIBRARY_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/MB_0027_LIBRARY_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/MB_0027_LIBRARY_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/MB_0027_LIBRARY_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/MB_0027_LIBRARY_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Marvel_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Marvel_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Marvel_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Marvel_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Marvel_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Marvel_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Marvel_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Marvel_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Translate_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Translate_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Translate_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Translate_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Translate_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Translate_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Translate_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Translate_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Visitors_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Visitors_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Visitors_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Visitors_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Visitors_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Visitors_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/Visitors_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/Visitors_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/apple_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/apple_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/apple_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/apple_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/apple_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/apple_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/apple_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/apple_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/b_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/b_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/b_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/b_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/b_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/b_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/b_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/b_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/book_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/book_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/book_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/book_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/book_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/book_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/book_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/book_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/calculator_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/calculator_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/calculator_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/calculator_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/calculator_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/calculator_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/calculator_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/calculator_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/cloud_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/cloud_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/cloud_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/cloud_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/cloud_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/cloud_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/cloud_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/cloud_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/convertor_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/convertor_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/convertor_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/convertor_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/convertor_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/convertor_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/convertor_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/convertor_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-d_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-d_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-d_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-d_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-d_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-d_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-d_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-d_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-j_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-j_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-j_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-j_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-j_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-j_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-j_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-j_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-p_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-p_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-p_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-p_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-p_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-p_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/currency-e-p_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/currency-e-p_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/da1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/da1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/da1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/da1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/da1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/da1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/da1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/da1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/da2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/da2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/da2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/da2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/da2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/da2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/da2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/da2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/favs2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/favs2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/favs2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/favs2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/favs2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/favs2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/favs2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/favs2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/iBOOKS_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/iBOOKS_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/iBOOKS_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/iBOOKS_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/iBOOKS_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/iBOOKS_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/iBOOKS_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/iBOOKS_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/java_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/java_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/java_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/java_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/java_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/java_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/java_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/java_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/light_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/light_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/light_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/light_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/light_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/light_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/light_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/light_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pin_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pin_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pin_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pin_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pin_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pin_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pin_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pin_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pliok2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pliok2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pliok2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pliok2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pliok2_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pliok2_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pliok2_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pliok2_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pliok_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pliok_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pliok_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pliok_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pliok_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pliok_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/pliok_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/pliok_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/plus_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/plus_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/plus_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/plus_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/plus_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/plus_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/plus_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/plus_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/range_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/range_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/range_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/range_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/range_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/range_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/range_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/range_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/sim_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/sim_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/sim_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/sim_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/sim_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/sim_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/sim_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/sim_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/weather1_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/weather1_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/weather1_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/weather1_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/weather1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/weather1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Other/weather1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/other/weather1_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/3dmax_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/3dmax_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/3dmax_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/3dmax_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/AE_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/AE_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/AE_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/AE_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Ai_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Ai_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Ai_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Ai_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Apps_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Apps_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Apps_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Apps_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Autocad_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Autocad_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Autocad_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Autocad_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Br_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Br_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Br_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Br_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Dw_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Dw_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Dw_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Dw_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Dw_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Dw_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Dw_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Dw_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Excel_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Excel_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Excel_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Excel_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Excel_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Excel_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Excel_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Excel_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fl_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fl_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fl_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fl_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fl_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fl_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fl_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fl_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Flash_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Flash_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Flash_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Flash_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fw_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fw_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fw_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fw_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fw_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fw_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fw_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fw_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fx_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fx_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fx_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fx_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fx_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fx_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Fx_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Fx_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/ID_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/ID_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/ID_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/ID_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/LR_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/LR_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/LR_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/LR_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/LR_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/LR_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/LR_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/LR_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Office2010_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Office2010_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Office2010_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Office2010_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/One-Note_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/One-Note_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/One-Note_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/One-Note_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Outlook_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Outlook_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Outlook_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Outlook_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Power-Point_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Power-Point_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Power-Point_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Power-Point_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Ps_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Ps_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Ps_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Ps_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Sb_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Sb_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Sb_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Sb_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Word_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Word_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Word_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Word_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Word_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Word_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/Word_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/Word_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/adobe-acrobat_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/adobe-acrobat_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/adobe-acrobat_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/adobe-acrobat_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/android_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/android_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/android_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/android_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/office_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/office_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/office_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/office_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/office_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/office_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/office_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/office_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/programs_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/programs_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/programs_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/programs_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/ps.com_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/ps.com_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/ps.com_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/ps.com_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/ps.com_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/ps.com_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/ps.com_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/ps.com_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/smartbuble_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/smartbuble_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/Suite/smartbuble_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/suite/smartbuble_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/System/apps4_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/system/apps4_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/System/apps4_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/system/apps4_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/System/keyboard2_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/system/keyboard2_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/System/keyboard2_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/system/keyboard2_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/System/off_hover.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/system/off_hover.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/System/off_hover.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/system/off_hover.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/System/reload_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/system/reload_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/System/reload_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/system/reload_normal.png diff --git a/src/main/resources/assets/gregtech/textures/gui/terminal/icon/System/skaner-1_normal.png b/src/main/resources/assets/gregtech/textures/gui/terminal/icon/system/skaner-1_normal.png similarity index 100% rename from src/main/resources/assets/gregtech/textures/gui/terminal/icon/System/skaner-1_normal.png rename to src/main/resources/assets/gregtech/textures/gui/terminal/icon/system/skaner-1_normal.png