回档奥

2024-11-11 01:27:35 +08:00 · 2022-01-28 17:28:52 +08:00 · 2022-01-28 17:28:52 +08:00 · 5d2e0582c3
commit 5d2e0582c3
parent d3e0f78d2c
12 changed files with 84 additions and 111 deletions
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
--- a/.idea/Musicreater.iml
+++ b/.idea/Musicreater.iml
@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="PYTHON_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-  <component name="PyDocumentationSettings">
-    <option name="format" value="PLAIN" />
-    <option name="myDocStringFormat" value="Plain" />
-  </component>
-</module>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@ -1,46 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="LongLine" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyArgumentEqualDefaultInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyAugmentAssignmentInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyClassicStyleClassInspection" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyCompatibilityInspection" enabled="false" level="WARNING" enabled_by_default="false">
-      <option name="ourVersions">
-        <value>
-          <list size="1">
-            <item index="0" class="java.lang.String" itemvalue="3.10" />
-          </list>
-        </value>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="PyMandatoryEncodingInspection" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyMissingTypeHintsInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true" />
-    <inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="ignoredErrors">
-        <list>
-          <option value="E501" />
-        </list>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="PyPep8NamingInspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
-      <option name="ignoredErrors">
-        <list>
-          <option value="N802" />
-          <option value="N803" />
-          <option value="N806" />
-          <option value="N813" />
-          <option value="N801" />
-        </list>
-      </option>
-    </inspection_tool>
-    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoredIdentifiers">
-        <list>
-          <option value="list.__getitem__" />
-          <option value="list.split" />
-        </list>
-      </option>
-    </inspection_tool>
-  </profile>
-</component>
--- a/.idea/inspectionProfiles/profiles_settings.xml
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@ -1,6 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <settings>
-    <option name="USE_PROJECT_PROFILE" value="false" />
-    <version value="1.0" />
-  </settings>
-</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.9" project-jdk-type="Python SDK" />
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/Musicreater.iml" filepath="$PROJECT_DIR$/.idea/Musicreater.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ChangeListManager">
+    <list default="true" id="23790c1b-3abf-4b77-846b-0bb9cf55d6be" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/Musicreater.iml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/profiles_settings.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/modules.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/vcs.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/Musicreater.py" beforeDir="false" afterPath="$PROJECT_DIR$/Musicreater.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/bgArrayLib/resourcesPath.rpposi" beforeDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="ProjectId" id="24J9rhIzzrHCDxbSvcuhuxAAjFi" />
+  <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+  </component>
+  <component name="RunManager">
+    <configuration name="Musicreater" type="PythonConfigurationType" factoryName="Python" temporary="true" nameIsGenerated="true">
+      <module name="Musicreater" />
+      <option name="INTERPRETER_OPTIONS" value="" />
+      <option name="PARENT_ENVS" value="true" />
+      <envs>
+        <env name="PYTHONUNBUFFERED" value="1" />
+      </envs>
+      <option name="SDK_HOME" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="IS_MODULE_SDK" value="true" />
+      <option name="ADD_CONTENT_ROOTS" value="true" />
+      <option name="ADD_SOURCE_ROOTS" value="true" />
+      <option name="SCRIPT_NAME" value="$PROJECT_DIR$/Musicreater.py" />
+      <option name="PARAMETERS" value="" />
+      <option name="SHOW_COMMAND_LINE" value="false" />
+      <option name="EMULATE_TERMINAL" value="false" />
+      <option name="MODULE_MODE" value="false" />
+      <option name="REDIRECT_INPUT" value="false" />
+      <option name="INPUT_FILE" value="" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Python.Musicreater" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="23790c1b-3abf-4b77-846b-0bb9cf55d6be" name="Default Changelist" comment="" />
+      <created>1643338026816</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1643338026816</updated>
+    </task>
+    <servers />
+  </component>
+</project>
--- a/Musicreater.py
+++ b/Musicreater.py
@ -1436,11 +1436,11 @@ def __main__():
    funcmenu.add_command(label=READABLETEXT[64], command=MakeCMD)
    funcmenu.add_command(label=READABLETEXT[65], command=MakeCMDdir)
    funcmenu.add_command(label=READABLETEXT[66], command=MakePackFile)
-    funcmenu.add_separator()
-    funcmenu.add_command(label=READABLETEXT[147], command=MakeNewCMD)
-    funcmenu.add_command(label=READABLETEXT[153], command=MakeNewCMDdir)
-    funcmenu.add_command(label=READABLETEXT[154], command=MakeNewFunctionPackFile)
-    funcmenu.add_command(label=READABLETEXT[155], command=MakeNewFunctionPack_ResourcesPacks_File)
+    # funcmenu.add_separator()
+    # funcmenu.add_command(label=READABLETEXT[147], command=MakeNewCMD)
+    # funcmenu.add_command(label=READABLETEXT[153], command=MakeNewCMDdir)
+    # funcmenu.add_command(label=READABLETEXT[154], command=MakeNewFunctionPackFile)
+    # funcmenu.add_command(label=READABLETEXT[155], command=MakeNewFunctionPack_ResourcesPacks_File)

    # 将子菜单加入到菜单条中
    main_menu_bar.add_cascade(label=READABLETEXT[67], menu=funcmenu)
@ -1483,7 +1483,7 @@ def __main__():
    helpmenu.add_command(label=READABLETEXT[85], command=ClearLog)
    helpmenu.add_command(label=READABLETEXT[86], command=resetver)
    helpmenu.add_command(label=READABLETEXT[152], command=end)
-    helpmenu.add_command(label=READABLETEXT[156], command=changeResourcesPath)
+    # helpmenu.add_command(label=READABLETEXT[156], command=changeResourcesPath)

    helpmenu.add_separator()  # 分隔符

--- a/README.md
+++ b/README.md
@ -64,31 +64,13 @@ python3 Musicreater.py
 2.  看得懂简体中文字的不一定全会用
 3.  最好要懂一点点英文

-
-### 诸葛亮与八卦阵的说明（不必要）
-
-1. 首先！这里的提示是给想使用多音色资源包的人的，如果你想请下载 神羽资源包（神羽自己的链接）：https://pan.baidu.com/s/11uoq5zwN7c3rX-98DqVpJg
-提取码:ek3t
-2. 下载到你自己电脑上某个位置，注意并不需要放置于本项目下。音色资源包较大，可以选取只下载：
-`神羽资源包_乐器、音源的资源包\羽音缭绕-midiout_25.0`   这个文件夹。
-3. 也可以只下载其中的：
-   `神羽资源包_乐器\音源的资源包\羽音缭绕-midiout_25.0\mcpack(国际版推荐)格式_25.0` 或者：
-   `神羽资源包_乐器\音源的资源包\羽音缭绕-midiout_25.0\zip格式_25.0`
-4. 接下来就是关键了:在音创中绑定资源包
-5. 首先，先打开音创->帮助与疑问->[神羽资源包位置选择]：选择文件夹... 这时候，
-会跳出选择框，关键来了，选择：***你的mcpack(国际版推荐)_25.0文件夹或zip格式_25.0文件夹，外面的！文件夹！注意是外面的文件夹！！***
-   举个例子：我的文件路径是这样的：
-   `L:\shenyu\音源的资源包\羽音缭绕-midiout_25.0`这里面有：`神羽资源包_25.0_使用方法.xls`、
-   `mcpack(国际版推荐)格式_25.0`、`zip格式_25.0`两个文件夹和一个.xls文件，而你在音创中
-   也应该选择这个文件夹：**L:\shenyu\音源的资源包\羽音缭绕-midiout_25.0**
-
 ### 致谢

 1.  感谢由 [Fuckcraft](https://github.com/fuckcraft) “鸣凤鸽子”等 带来的我的世界websocket服务器功能
 2.  感谢 昀梦\<QQ1515399885\> 找出指令生成错误bug并指正
 3.  感谢由 Charlie_Ping “查理平” 带来的bdx转换功能
 4.  感谢由 CMA_2401PT 带来的 BDXWorkShop 供本程序对于bdx操作的指导
-5.  感谢由 Miracle Plume “神羽” \<QQshenyu40403\>带来的基岩版资源包
+5.  
 6.  感谢广大群友为此程序提供的测试等支持
 7.  若您对我们有所贡献但您的名字没有显示在此列表中，请联系我！

--- a/bgArrayLib/resourcesPath.rpposi
+++ b/bgArrayLib/resourcesPath.rpposi
@ -1 +0,0 @@
-L:/shenyu/音源的资源包/羽音缭绕-midiout_25.0
--- a/17_22_27.logger
+++ b/17_22_27.logger
@ -0,0 +1,4 @@
+2022-01-28 17:22:27,138 - nmcsup.log - INFO - 更新执行位置，当前文件位置 L:\0WorldMusicCreater-MFMS new edition\框架\v0.5.2\Musicreater\Musicreater.py
+2022-01-28 17:22:27,508 - nmcsup.log - INFO - 启动root.mainloop（窗口）
+2022-01-28 17:22:47,849 - nmcsup.log - INFO - 退出
+2022-01-28 17:22:47,849 - nmcsup.log - INFO - 程序正常退出
				`@ -1 +0,0 @@`
				`L:/shenyu/音源的资源包/羽音缭绕-midiout_25.0`