Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions .github/ISSUE_TEMPLATE/00-BugReport.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Report Bug (报告 Bug)
description: "Report a crash, mod conflict, or any other type of bug. (报告崩溃、模组冲突或任何其他类型的 Bug。)"
labels:
- "bug"
assignees: CallmeSHaobe
body:
- type: input
id: pack_version
attributes:
label: Your Pack Version (你的整合包版本)
description: What version of the pack are you playing? If you're using an ancient version maybe first try updating the pack. We usually fix hundreds of issues per release, so there is a good chance your problem have been fixed already in the latest version. There are also usually Dev releases inbetween Official releases that may not show up on other platforms. (你玩的是哪个版本的整合包?如果版本很旧,建议先尝试更新整合包。我们通常每个版本修复若干个问题,所以你的问题很可能在最新版本中已经修复。此外,官方版本之间通常还有 Dev 版本,其他平台可能不会显示。)
placeholder: "Example: 2.1.1.0 (示例: 2.1.1.0)"
validations:
required: true
- type: input
id: mod_version
attributes:
label: Mod Version (模组版本)
description: What version of the mod are you using? Give an actual version number or jar name, not "latest". Speaking of which, if you are not on the latest jar, try updating first. (你正在使用哪个版本的模组?请给出实际的版本号或 jar 文件名,而不是"latest"。另外,如果你没有使用最新版 jar,请先尝试更新。)
placeholder: "example: 3.4 (示例: 3.4)"
validations:
required: true
- type: textarea
id: whatistheissue
attributes:
label: Describe the Issue (描述问题)
description: Give a description of the issue, steps to reproduce the issue, as well as what you think the expected result should be. (请描述问题内容、复现步骤,以及你认为的预期结果。)
placeholder: "Example: 1 Foo is crafted but no Bar is consumed. 1 Bar should be consumed. (示例: 合成了 1 个 Foo,但没有消耗 Bar。应该消耗 1 个 Bar。)"
validations:
required: true
- type: textarea
id: conflict
attributes:
label: Conflicting Mods (冲突模组)
description: If this is a mod conflict, list the mods you think are causing the issue. (如果是模组冲突,请列出你认为导致问题的模组。)
placeholder: "Example: Causes <insert feature> to break only if <insert modname> is installed (示例: 只有安装了 <模组名> 时,<功能> 才会出问题)"
validations:
required: false
- type: dropdown
id: java
attributes:
label: Java Version (Java 版本)
description: What Java version are you using? It's worth mentioning that if you play on Java9+ you should try update to latest minor release (e.g. prefer Java 17.0.6 over 17.0.2) of that version. (你使用的是哪个 Java 版本?值得一提的是,如果你在 Java9+ 上游玩,建议更新到该版本的最新小版本,例如优先选择 Java 17.0.6 而不是 17.0.2。)
options:
- Java 8
- Java 9
- Java 11
- Java 17
- Java 19
- Java 20
- Java 21
- Java 22
- Java 23
- Java 24
- Java 25
- Java 26
- Other versions in between (其他介于两者之间的版本)
validations:
required: true
- type: textarea
id: report
attributes:
label: Crash Report / Log (崩溃报告 / 日志)
description: "If no crash report is created, attach `logs/fml-client-latest.log` or `logs/fml-server-latest.log`, depending on if it's a dedicated server crash or a client crash. You can also type in additional info that you consider important. (如果没有生成崩溃报告,请根据是专用服务器崩溃还是客户端崩溃,附上 `logs/fml-client-latest.log` 或 `logs/fml-server-latest.log`。你也可以补充你认为重要的其他信息。)"
placeholder: "Example: pastebin/something OR submit the file to github by dragging it to this textbox. (示例: pastebin 链接,或将文件拖拽到输入框中上传到 GitHub。)"
validations:
required: true
- type: checkboxes
id: final
attributes:
label: Final Checklist (最终确认清单)
description: Please mark them so we can better handle this report. (请勾选以下选项,以便我们更好地处理这份报告。)
options:
- label: "I have searched this issue tracker and there is nothing similar already. Posting on a closed issue saying the crash still exists will prompt us to investigate and reopen it once we confirm your report. (我已经搜索过问题跟踪器,没有类似的已存在报告。如果在已关闭的问题下回复说崩溃仍然存在,我们会在确认你的报告后进行调查并重新打开它。)"
required: true
- label: "I can reproduce this crash consistently by following the exact steps I described above. (我可以按照上述步骤稳定复现这个崩溃。)"
required: false
- label: "I have asked other people and they confirm they also crash by following the exact steps I described above. (我已经询问过其他人,他们确认按上述步骤操作也会崩溃。)"
required: false
59 changes: 59 additions & 0 deletions .github/ISSUE_TEMPLATE/01-FeatureRequest.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: 'Request New Feature (请求新功能)'
description: Request a new feature. (请求一个新功能。)
assignees: CallmeSHaobe
labels:
- "Feature"
body:
- type: markdown
attributes:
value: 'Examples of this category include: add a new item, add a new function. (此类示例包括:添加新物品、添加新功能。)

Please note that if you want to change an existing feature, e.g. think something is too OP, you should use the Suggest a Change template instead. (请注意,如果你想修改现有功能,例如认为某个东西太强,请改用 Suggest a Change 模板。)'
- type: input
id: version
attributes:
label: Your Pack Version (你的整合包版本)
description: What version of the pack are you playing? If you're using an ancient version maybe first try updating the pack. We add new features all the time, so your feature may already be in the latest version. There are also usually Dev releases inbetween Official releases that may not show up on other platforms. (你玩的是哪个版本的整合包?如果版本很旧,建议先尝试更新整合包。我们一直在添加新功能,所以你的功能请求可能已经存在于最新版本中。此外,官方版本之间通常还有 Dev 版本,其他平台可能不会显示。)
placeholder: "Example: 2.1.1.0 (示例: 2.1.1.0)"
validations:
required: true
- type: input
id: mod_version
attributes:
label: Mod Version (模组版本)
description: What version of the mod are you using? Give an actual version number or jar name, not "latest". Speaking of which, if you are not on the latest jar, try updating first. (你正在使用哪个版本的模组?请给出实际的版本号或 jar 文件名,而不是"latest"。另外,如果你没有使用最新版 jar,请先尝试更新。)
placeholder: "Example: 3.4 (示例: 3.4)"
validations:
required: true
- type: textarea
id: proposal
attributes:
label: Your Proposal (你的提议)
description: What do you propose? Please describe it briefly in one or two sentence. (你想提议什么?请用一两句话简要描述。)
placeholder: "Example: Add a new chain function. (示例: 添加一个新的连锁功能。)"
validations:
required: true
- type: textarea
id: goal
attributes:
label: Your Goal (你的目标)
description: Why is this feature needed? (为什么需要这个功能?)
placeholder: "Example: Old mode can't fill my heart. (示例: 旧的模式无法填满我的心。)"
validations:
required: true
- type: checkboxes
id: final
attributes:
label: Final Checklist (最终确认清单)
description: Please mark them so we know you are serious with your suggestion. (请勾选以下选项,以便我们知道你是认真提出建议的。)
options:
- label: "I have searched this issue tracker and there is nothing similar already. Posting on a closed issue saying *I like this feature please reconsider adding it* will prompt us to investigate and reopen it once we confirm your report. (我已经搜索过问题跟踪器,没有类似的已存在请求。如果在已关闭的问题下回复*我喜欢这个功能,请重新考虑添加它*,我们会在确认你的报告后进行调查并重新打开它。)"
required: true
- label: "I believe there is nothing similar in the pack already, or the existing solution isn't good enough. (我认为整合包中还没有类似的功能,或者现有的解决方案不够好。)"
required: true
- label: "I understand this change request may not attract enough attention and thus not be implemented. (我理解这个修改请求可能得不到足够的关注,因此可能不会被实现。)"
required: true
- label: "I understand this change request may be rejected due to other community members thinking it's inappropriate. (我理解这个修改请求可能会因为其他社区成员认为不合适而被拒绝。)"
required: true
- label: "I believe this feature would make the pack better. (我相信这个功能会让整合包变得更好。)"
required: true
59 changes: 59 additions & 0 deletions .github/ISSUE_TEMPLATE/02-SuggestChange.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: 'Suggest a Change (建议修改)'
description: Suggest a Change to existing content. (对现有内容提出修改建议。)
assignees: CallmeSHaobe
labels:
- "Request-Change"
body:
- type: markdown
attributes:
value: 'Examples of this category include: changing an existing feature, changing a recipe, nerfing an item, buffing an item. (此类示例包括:修改现有功能、修改合成配方、削弱或加强某个物品。)

Please note that if you want to add a new feature, use the Feature Request template instead. (请注意,如果你想添加新功能,请改用"请求新功能"模板。)'
- type: input
id: version
attributes:
label: Your Pack Version (你的整合包版本)
description: What version of the pack are you playing? If you're using an ancient version maybe first try updating the pack. We change things all the time, so your suggested change may already be applied in the latest version. There are also usually Dev releases inbetween Official releases that may not show up on other platforms. (你玩的是哪个版本的整合包?如果版本很旧,建议先尝试更新整合包。我们一直在修改内容,所以你的建议可能已经在最新版本中生效。此外,官方版本之间通常还有 Dev 版本,其他平台可能不会显示。)
placeholder: "Example: 2.1.1.0 (示例: 2.1.1.0)"
validations:
required: true
- type: input
id: mod_version
attributes:
label: Mod Version (模组版本)
description: What version of the mod are you using? Give an actual version number or jar name, not "latest". Speaking of which, if you are not on the latest jar, try updating first. (你正在使用哪个版本的模组?请给出实际的版本号或 jar 文件名,而不是"latest"。另外,如果你没有使用最新版 jar,请先尝试更新。)
placeholder: "Example: 3.4 (示例: 3.4)"
validations:
required: true
- type: textarea
id: change
attributes:
label: Your Suggestion (你的建议)
description: What do you want to change? Please describe it briefly in one or two sentences. (你想修改什么?请用一两句话简要描述。)
placeholder: "Example: Buff the chain mining speed. (示例: 提升连锁挖矿的速度。)"
validations:
required: true
- type: textarea
id: goal
attributes:
label: Your Goal (你的目标)
description: Why is this change needed? (为什么需要这个修改?)
placeholder: "Example: The current speed is too slow for large tunnels. (示例: 对于大型隧道来说当前速度太慢了。)"
validations:
required: true
- type: checkboxes
id: final
attributes:
label: Final Checklist (最终确认清单)
description: Please mark them so we know you are serious with your suggestion. (请勾选以下选项,以便我们知道你是认真提出建议的。)
options:
- label: "I have searched this issue tracker and there is nothing similar already. Posting on a closed issue saying *I like this change please reconsider it* will prompt us to investigate and reopen it once we confirm your report. (我已经搜索过问题跟踪器,没有类似的已存在请求。如果在已关闭的问题下回复*我喜欢这个修改,请重新考虑*,我们会在确认你的报告后进行调查并重新打开它。)"
required: true
- label: "I believe there is nothing similar in the pack already, or the existing solution isn't good enough. (我认为整合包中还没有类似的内容,或者现有的解决方案不够好。)"
required: true
- label: "I understand this change request may not attract enough attention and thus not be implemented. (我理解这个修改请求可能得不到足够的关注,因此可能不会被实现。)"
required: true
- label: "I understand this change request may be rejected due to other community members thinking it's inappropriate. (我理解这个修改请求可能会因为其他社区成员认为不合适而被拒绝。)"
required: true
- label: "I believe this change would make the pack better. (我相信这个修改会让整合包变得更好。)"
required: true
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
blank_issues_enabled: false
1 change: 1 addition & 0 deletions src/main/java/com/newmaa/othtech/OTHTechnology.java
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ public static void registerRenderers() {}
public void postInit(FMLPostInitializationEvent event) {
proxy.postInit(event);
LOG.info("The Isa Mill is invincible!");
LOG.info("NewMaa的恩情还不完!");
MachineLoader.loadMachinePostInit();
// RecipeLoader.loadRecipesPostInit();
// 添加自定义配方
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/newmaa/othtech/machine/MachineLoader.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@

import static net.minecraft.util.StatCollector.translateToLocal;

import com.gtnewhorizon.gtnhlib.util.AnimatedTooltipHandler;
import com.newmaa.othtech.common.OTHItemList;
import com.newmaa.othtech.machine.hatch.OTEHatchRack;
import com.newmaa.othtech.machine.hatch.OTEWTFHatch;
import com.newmaa.othtech.utils.AuthorAnimation;

import gregtech.api.enums.Materials;
import gregtech.api.enums.TierEU;
Expand Down Expand Up @@ -183,6 +185,9 @@ public static void loadMachines() {
OTHItemList.Beeyonds.set(new OTEBeeyonds(IDs + 58, "IndustrialBeeHouse", translateToLocal("ote.tn.bee")));
OTHItemList.OTEBBPlasmaForge
.set(new OTEBBPlasmaForge(IDs + 59, "OTEBBPlasmaForge", translateToLocal("ote.tn.bbpf")));
// 注册实时动画作者行(gtnhlib AnimatedTooltipHandler 在渲染时逐帧求值,同 GT5U LoaderMetaTileEntities 的做法)
AnimatedTooltipHandler
.addItemTooltip(OTHItemList.OTEBBPlasmaForge.get(1), AuthorAnimation.getTooltipSupplier());
OTHItemList.OTEComputer.set(new OTEComputer(IDs + 60, "OTEComputer", translateToLocal("ote.computer.name")));
OTHItemList.OTEHatchRack
.set(new OTEHatchRack(IDs + 61, "OTEHatchRack", translateToLocal("ote.calc.rank"), 11).getStackForm(1L));
Expand Down
Loading