Skip to content

Commit

Permalink
2.3.0BETA_3
Browse files Browse the repository at this point in the history
  • Loading branch information
@KostromDan
KostromDan committed Mar 27, 2024
1 parent 5255973 commit f1f45b5
Show file tree
Hide file tree
Showing 7 changed files with 18 additions and 26 deletions.
8 changes: 4 additions & 4 deletions MDGUi/forms/MDGHelpWindow.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
<x>0</x>
<y>0</y>
<width>1163</width>
<height>2444</height>
<height>2454</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
Expand Down Expand Up @@ -151,13 +151,13 @@ li.checked::marker { content: &quot;\2612&quot;; }
<property name="minimumSize">
<size>
<width>0</width>
<height>120</height>
<height>130</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>120</height>
<height>130</height>
</size>
</property>
<property name="verticalScrollBarPolicy">
Expand All @@ -175,7 +175,7 @@ li.unchecked::marker { content: &quot;\2610&quot;; }
li.checked::marker { content: &quot;\2612&quot;; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:12pt; font-weight:700;&quot;&gt;MDK Archive Path:&lt;/span&gt; &lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the Forge MDK archive corresponding to the Minecraft version you are using. &lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the Forge MDK archive corresponding to the Minecraft version you are using. Always use the latest MDK because mappings remain same for corresponding version of Minecraft, although some deobfuscation issues may be fixed between different versions of the MDK.&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;You can find it on the MinecraftForge downloads page.&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;After downloading the MDK, select the file without unarchiving it, using the same method as selecting the mods folder. &lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
Expand Down
12 changes: 6 additions & 6 deletions MDGUi/generated/Ui_MDGHelpWindow.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ def setupUi(self, MDGHelpWindow):
self.scrollArea.setWidgetResizable(True)
self.scrollAreaWidgetContents = QWidget()
self.scrollAreaWidgetContents.setObjectName(u"scrollAreaWidgetContents")
self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 1163, 2444))
self.scrollAreaWidgetContents.setGeometry(QRect(0, 0, 1163, 2454))
self.verticalLayout_2 = QVBoxLayout(self.scrollAreaWidgetContents)
self.verticalLayout_2.setObjectName(u"verticalLayout_2")
self.textBrowser_2 = QTextBrowser(self.scrollAreaWidgetContents)
Expand Down Expand Up @@ -75,8 +75,8 @@ def setupUi(self, MDGHelpWindow):
self.mdk_path.setObjectName(u"mdk_path")
sizePolicy1.setHeightForWidth(self.mdk_path.sizePolicy().hasHeightForWidth())
self.mdk_path.setSizePolicy(sizePolicy1)
self.mdk_path.setMinimumSize(QSize(0, 120))
self.mdk_path.setMaximumSize(QSize(16777215, 120))
self.mdk_path.setMinimumSize(QSize(0, 130))
self.mdk_path.setMaximumSize(QSize(16777215, 130))
self.mdk_path.setVerticalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
self.mdk_path.setSizeAdjustPolicy(QAbstractScrollArea.AdjustToContents)

Expand Down Expand Up @@ -285,9 +285,9 @@ def retranslateUi(self, MDGHelpWindow):
"li.checked::marker { content: \"\\2612\"; }\n"
"</style></head><body style=\" font-family:'Segoe UI'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-size:12pt; font-weight:700;\">MDK Archive Path:</span> </p>\n"
"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Choose the Forge MDK archive corresponding to the Minecraft version you are using. </p>\n"
"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0;"
" text-indent:0px;\">You can find it on the MinecraftForge downloads page.</p>\n"
"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Choose the Forge MDK archive corresponding to the Minecraft version you are using. Always use the latest MDK because mappings remain same for corresponding version of Minecraft, although some deo"
"bfuscation issues may be fixed between different versions of the MDK.</p>\n"
"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">You can find it on the MinecraftForge downloads page.</p>\n"
"<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">After downloading the MDK, select the file without unarchiving it, using the same method as selecting the mods folder. </p></body></html>", None))
self.mdk_help_download_button.setText(QCoreApplication.translate("MDGHelpWindow", u"how to download mdk?", None))
self.mdk_button.setText(QCoreApplication.translate("MDGHelpWindow", u"open MinecraftForge downloads page", None))
Expand Down
2 changes: 1 addition & 1 deletion MDGUi/generated/resources_rc.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8413,7 +8413,7 @@
\x00\x00\x00\x00\x00\x02\x00\x00\x00\x01\x00\x00\x00\x02\
\x00\x00\x00\x00\x00\x00\x00\x00\
\x00\x00\x00\x12\x00\x00\x00\x00\x00\x01\x00\x00\x00\x00\
\x00\x00\x01\x8en\x18\xda\x0d\
\x00\x00\x01\x8e}\x1e>\xd6\
"

def qInitResources():
Expand Down
8 changes: 0 additions & 8 deletions MDGUtil/MDGLogger.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,6 @@ def log_exceptions(exc_type: Type[BaseException], value: BaseException, tb: Trac
sys.__excepthook__(exc_type, value, tb)


class RelativePathFilter(logging.Filter):
def filter(self, record: logging.LogRecord) -> bool:
project_root = os.path.abspath(os.path.join(os.path.dirname(__file__), '..'))
record.relativepath = os.path.relpath(record.pathname, project_root)
return True


class LoggerSignal(QObject):
append_logger_signal = Signal(str, str)

Expand Down Expand Up @@ -73,7 +66,6 @@ def __init__(self) -> None:
format=LOGGER_FORMAT)

logger = logging.getLogger()
logger.addFilter(RelativePathFilter())

console_handler = logging.StreamHandler()
console_handler.setFormatter(logging.Formatter(LOGGER_FORMAT))
Expand Down
12 changes: 6 additions & 6 deletions MDGUtil/PathUtils.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@


def get_gradle_caches_path():
gradle_user_home = os.environ.get("GRADLE_USER_HOME")
gradle_user_home = os.environ.get('GRADLE_USER_HOME')

if gradle_user_home:
gradle_caches_path = os.path.join(gradle_user_home, "caches")
gradle_caches_path = os.path.join(gradle_user_home, 'caches')
else:
home_dir = os.path.expanduser("~")
gradle_caches_path = os.path.join(home_dir, ".gradle", "caches")
home_dir = os.path.expanduser('~')
gradle_caches_path = os.path.join(home_dir, '.gradle', 'caches')

return gradle_caches_path

Expand Down Expand Up @@ -50,8 +50,8 @@ def get_gradle_caches_path():

DEFAULT_DECOMPILER_CMD = rf'{{java}} -jar {DECOMPILER_JAR_PATH} -dgs=1 -din=1 -log=WARN {{path_to_jar}} {{out_path}}'
DEFAULT_BON2_CMD = (
rf'{{java}} -jar {{bon2_path}} --inputJar {{path_to_jar}} --outputJar {{out_path}} --mcVer {{mc_ver}} '
rf'--mappingsVer {{mappings_ver}} --notch')
r'{java} -jar {bon2_path} --inputJar {path_to_jar} --outputJar {out_path} --mcVer {mc_ver} '
r'--mappingsVer {mappings_ver} --notch')


def check_pyinstaller_env() -> bool:
Expand Down
2 changes: 1 addition & 1 deletion built_to_exe.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

from MDGUtil import PathUtils, FileUtils

VERSION = '2.3.0BETA_2'
VERSION = '2.3.0BETA_3'


def main():
Expand Down
Binary file modified requirements.txt
View file
Binary file not shown.

0 comments on commit f1f45b5

Please sign in to comment.