diff --git a/contrib/cyrillic_convert.py b/contrib/cyrillic_convert.py index 58eafd314..4a8a4c705 100644 --- a/contrib/cyrillic_convert.py +++ b/contrib/cyrillic_convert.py @@ -4,7 +4,6 @@ import fileinput import argparse -import sys gibberish_to_cyrillic = { 'À': 'А', diff --git a/overviewer.py b/overviewer.py index 8e9783b3d..57d1a64a3 100755 --- a/overviewer.py +++ b/overviewer.py @@ -17,7 +17,6 @@ from __future__ import print_function -import platform import sys # quick version check @@ -28,7 +27,6 @@ import os import os.path import re -import subprocess import multiprocessing import time import logging @@ -38,10 +36,9 @@ from overviewer_core import util from overviewer_core import logger from overviewer_core import textures -from overviewer_core import optimizeimages, world +from overviewer_core import world from overviewer_core import config_parser, tileset, assetmanager, dispatcher from overviewer_core import cache -from overviewer_core import observer from overviewer_core.nbt import CorruptNBTError helptext = """ diff --git a/overviewer_core/progressbar.py b/overviewer_core/progressbar.py index c06ceed5c..5fe10ddd5 100644 --- a/overviewer_core/progressbar.py +++ b/overviewer_core/progressbar.py @@ -343,8 +343,6 @@ def finish(self): if __name__=='__main__': - import os - def example1(): widgets = ['Test: ', Percentage(), ' ', Bar(marker=RotatingMarker()), ' ', ETA(), ' ', FileTransferSpeed()] diff --git a/overviewer_core/settingsDefinition.py b/overviewer_core/settingsDefinition.py index 78def0ed2..1c4ceca96 100644 --- a/overviewer_core/settingsDefinition.py +++ b/overviewer_core/settingsDefinition.py @@ -46,8 +46,7 @@ from collections import OrderedDict from .settingsValidators import * -from .observer import ProgressBarObserver, LoggingObserver, JSObserver -from .optimizeimages import pngnq, optipng, pngcrush +from .observer import ProgressBarObserver, LoggingObserver import platform import sys diff --git a/overviewer_core/settingsValidators.py b/overviewer_core/settingsValidators.py index 3ae70f03c..c7a2fc650 100644 --- a/overviewer_core/settingsValidators.py +++ b/overviewer_core/settingsValidators.py @@ -5,7 +5,6 @@ from collections import OrderedDict from . import rendermodes -from . import util from .optimizeimages import Optimizer from .world import LOWER_LEFT, LOWER_RIGHT, UPPER_LEFT, UPPER_RIGHT diff --git a/overviewer_core/textures.py b/overviewer_core/textures.py index 88677264d..321c9545c 100644 --- a/overviewer_core/textures.py +++ b/overviewer_core/textures.py @@ -3622,10 +3622,7 @@ def repeater(self, blockid, data): top = self.load_image_texture("assets/minecraft/textures/block/repeater.png") if blockid == 93 else self.load_image_texture("assets/minecraft/textures/block/repeater_on.png") side = self.load_image_texture("assets/minecraft/textures/block/smooth_stone_slab_side.png") increment = 13 - - if (data & 0x3) == 0: # pointing east - pass - + if (data & 0x3) == 1: # pointing south top = top.rotate(270) diff --git a/overviewer_core/tileset.py b/overviewer_core/tileset.py index 4f2def606..ece5d1ee7 100644 --- a/overviewer_core/tileset.py +++ b/overviewer_core/tileset.py @@ -15,7 +15,6 @@ import errno import functools -import itertools import logging import os import os.path diff --git a/overviewer_core/util.py b/overviewer_core/util.py index 403cbcd06..5050ddf37 100644 --- a/overviewer_core/util.py +++ b/overviewer_core/util.py @@ -22,7 +22,7 @@ import os.path import platform import sys -from itertools import cycle, islice, product +from itertools import cycle, islice from string import hexdigits from subprocess import PIPE, Popen diff --git a/overviewer_core/world.py b/overviewer_core/world.py index c96db5325..2f8ab0212 100644 --- a/overviewer_core/world.py +++ b/overviewer_core/world.py @@ -18,9 +18,7 @@ import os.path import logging import time -import random import re -import locale import numpy diff --git a/setup.py b/setup.py index af0abd6fc..440b1b1c2 100755 --- a/setup.py +++ b/setup.py @@ -16,8 +16,6 @@ from distutils.command.clean import clean from distutils.command.build_ext import build_ext from distutils.command.sdist import sdist -from distutils.cmd import Command -from distutils.dir_util import remove_tree from distutils.sysconfig import get_python_inc from distutils import log import os, os.path