Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
159 commits
Select commit Hold shift + click to select a range
c9d1f93
修改版本号
Circulate233 Dec 18, 2024
19cce9b
为血之祭坛注册结构预览的升级显示
Circulate233 Dec 18, 2024
865a7a9
删除多余导入
Circulate233 Dec 19, 2024
c8bfbd2
修复地心钻探机打开不成形GUI崩溃的问题
Circulate233 Dec 25, 2024
d245faa
修复了复制机JEI不显示部分配方的问题
Circulate233 Dec 27, 2024
8d68368
....刚刚有点问题,重来
Circulate233 Dec 27, 2024
05e8d14
黑名单掉"mekanismgenerators","artisanworktables",使其物品不注册复制机JEI
Circulate233 Dec 27, 2024
6528c06
新增 无线通用终端,可以作为所有的无线终端使用(不支持合成拓展那几个)
Circulate233 Jan 6, 2025
484633a
修复通用终端饰品栏无法使用快捷键的问题
Circulate233 Jan 6, 2025
8b3db26
漏了一个文件没提交
Circulate233 Jan 6, 2025
29dc1d4
修复一个导致服务端崩溃的bug
Circulate233 Jan 6, 2025
46be1cd
Merge pull request #1 from NovaEngineering-Source/master
Circulate233 Jan 6, 2025
f7004e7
重新添加复制机JEI
Circulate233 Jan 6, 2025
005a405
修复了无线通用终端的合成计划无法正确返回终端的问题
Circulate233 Jan 7, 2025
fb6d0e4
关于修复ae2fcr的无线流体样板终端bug的尝试
Circulate233 Jan 7, 2025
d5c3932
回退
Circulate233 Jan 8, 2025
c4d86c2
使无线通用终端模块式运行
Circulate233 Jan 8, 2025
fcd3df5
补充
Circulate233 Jan 8, 2025
364fddc
修复一个bug,相当愚蠢的我(
Circulate233 Jan 8, 2025
baab601
bug修复...
Circulate233 Jan 8, 2025
e258868
修复bug
Circulate233 Jan 8, 2025
144cfcd
修复bug
Circulate233 Jan 8, 2025
d1cd06d
为通用终端添加无线气体终端支持,修复一些bug
Circulate233 Jan 9, 2025
6b7077d
Merge pull request #2 from NovaEngineering-Source/master
Circulate233 Jan 9, 2025
62f9680
修改版本号
Circulate233 Jan 9, 2025
e0503a9
Merge branch 'master' of https://github.com/Circulate233/NovaEngineer…
Circulate233 Jan 9, 2025
b43dfc6
使通用终端兼容拓展合成终端
Circulate233 Jan 10, 2025
418f3d8
修正拓展合成终端模式下的崩溃bug
Circulate233 Jan 10, 2025
6cea7f0
修正拓展合成终端模式下的崩溃bug,优化nbt结构
Circulate233 Jan 10, 2025
a12c27e
修正拓展合成终端模式下的崩溃bug,优化nbt结构
Circulate233 Jan 10, 2025
4f74f3f
补充
Circulate233 Jan 10, 2025
0e10937
一些处理
Circulate233 Jan 12, 2025
6f4f6ea
一些处理
Circulate233 Jan 12, 2025
4bb7a5e
修复刚刚出现的崩溃bug
Circulate233 Jan 12, 2025
3acdc7d
更换了模块血之祭坛的注册id
Circulate233 Jan 14, 2025
cf77220
修复配方并行消耗的算力可能大于剩余算力上限的问题
Circulate233 Jan 14, 2025
0adc0eb
新增一条小提示
Circulate233 Jan 17, 2025
449ebbc
修复服务端运行时会崩溃的bug
Circulate233 Jan 17, 2025
32d5507
修改地心采矿的矿物列表
Circulate233 Jan 18, 2025
cafd40e
仍然是修复服务端崩溃
Circulate233 Jan 19, 2025
a19ff95
修复通用终端无法从合成界面正确返回原本界面的问题
Circulate233 Jan 21, 2025
69b88fd
修复通用终端无法从合成界面正确返回原本界面的问题
Circulate233 Jan 21, 2025
b330886
修复一个小bug
Circulate233 Jan 23, 2025
361157a
Merge pull request #3 from NovaEngineering-Source/master
Circulate233 Jan 23, 2025
a06df23
修复无线合成终端不能使用ctrl启动合成的bug
Circulate233 Jan 23, 2025
e81f51e
删除多余的调试信息,优化代码结构
Circulate233 Jan 24, 2025
8477b84
修改地心采矿的产量
Circulate233 Jan 24, 2025
9865903
修复无线合成终端在服务端不能使用ctrl启动合成的bug..
Circulate233 Jan 25, 2025
8d04f28
补充
Circulate233 Jan 25, 2025
f01eb32
更换一些矿机为半异步运行
Circulate233 Jan 26, 2025
71678e3
调整地心采矿,修复一些bug,为无线通用终端添加tooltips
Circulate233 Jan 29, 2025
94fdaf3
处理一个我愚蠢的写法导致的愚蠢的启动时卡顿(
Circulate233 Jan 30, 2025
d68dc52
处理一个我愚蠢的写法导致的愚蠢的启动时卡顿(
Circulate233 Jan 30, 2025
7104461
修复一个两个三个四个bug
Circulate233 Feb 2, 2025
fb9013a
注册附魔和相关的匠魂强化
Circulate233 Feb 4, 2025
deabbcf
实现了附魔逻辑,为匠魂书添加了强化信息
Circulate233 Feb 5, 2025
b121f71
添加本地化
Circulate233 Feb 5, 2025
ecf2e73
暂时性修复ae2fcr的无线流体样板终端的bug和JEI无法导入127以上物品的bug
Circulate233 Feb 6, 2025
c045e88
更新版本号
Circulate233 Feb 7, 2025
7bc6d5b
拆分mod独立发布
Circulate233 Feb 10, 2025
dc06169
Merge pull request #4 from NovaEngineering-Source/master
Circulate233 Feb 16, 2025
47304d9
为opt检测mod添加本地化支持
Circulate233 Feb 18, 2025
b5837e2
暴力的禁用了原版配方书
Circulate233 Feb 18, 2025
f14ac41
Merge pull request #5 from NovaEngineering-Source/master
Circulate233 Feb 25, 2025
0598f6a
将血之祭坛转为半异步运行防止出现异步区块加载
Circulate233 Feb 27, 2025
cc5cb20
增加一个用于计算时钟座时间的物品
Circulate233 Feb 27, 2025
7fe0305
对粗矿挖掘逻辑进行优化
Circulate233 Mar 1, 2025
7320ad2
修复意外的红石矿石的变种形态无法被匹配为粗矿的问题
Circulate233 Mar 4, 2025
bdd1b07
一些更新
Circulate233 Mar 13, 2025
557d17e
禁用植物魔法的红线容器
Circulate233 Mar 15, 2025
3650d9d
一些乱七八糟的东西,并且强化了一下地心采矿
Circulate233 Mar 18, 2025
67b03b5
一些乱七八糟的东西,并且强化了一下地心采矿
Circulate233 Mar 26, 2025
1154447
更换版本号
Circulate233 Apr 1, 2025
122f8c3
Merge pull request #6 from NovaEngineering-Source/master
Circulate233 Apr 8, 2025
aa1047d
添加气体组件
sddsd2332 Apr 10, 2025
1ad32fd
Merge branch 'master' into Circulate233-branch
Circulate233 Apr 10, 2025
faac4c5
Merge pull request #7 from sddsd2332/Circulate233-branch
Circulate233 Apr 10, 2025
200bba6
更新版本
Circulate233 Apr 17, 2025
54525f8
对EC进行一个乱杀
Circulate233 Apr 21, 2025
10a2bb7
解决愚蠢的并行核心要挖了重放的问题
Circulate233 Apr 21, 2025
a2f589f
修复假玩家精准采集矿石时的故障
Circulate233 Apr 22, 2025
4fb5d7b
修正因为techguns导致的活木化身手持物品时概率直接崩端
Circulate233 Apr 29, 2025
3f3762a
修正气体矩阵的key
Circulate233 May 4, 2025
f7b49c8
Add files via upload
450J3E1 May 4, 2025
015017b
Add files via upload
450J3E1 May 4, 2025
407158c
Add files via upload
450J3E1 May 4, 2025
50d5e62
Update book.json
450J3E1 May 4, 2025
a87bfd4
Add files via upload
450J3E1 May 4, 2025
a4570d8
检查java是否为1.8.0_271以下
Circulate233 May 4, 2025
3559812
Add files via upload
450J3E1 May 5, 2025
1e56871
Merge pull request #8 from 450J3E1/Exemplum
Circulate233 May 5, 2025
84c7817
可控制的自动超频,通过智能数据接口操作
Circulate233 May 5, 2025
0544006
Merge remote-tracking branch 'origin/master'
Circulate233 May 5, 2025
fde2972
更新
Circulate233 May 5, 2025
2209530
Delete src/main/resources/assets/novaeng_core/patchouli_books/eco_tl/…
450J3E1 May 6, 2025
61a4c90
Add files via upload
450J3E1 May 6, 2025
7778924
Add files via upload
450J3E1 May 6, 2025
4437d7d
完全使用mmce的控制器掉落方法来防止控制器出现错误的二次掉落
Circulate233 May 6, 2025
a06f3ff
Merge pull request #9 from 450J3E1/Exemplum
Circulate233 May 7, 2025
d1f5613
crl服务端环境下高级传送符咒无法使用的问题
Circulate233 May 7, 2025
0a18589
尝试修复legendarytooltips部分情况下的java.lang.IndexOutOfBoundsException: Index…
Circulate233 May 7, 2025
ac508e3
唉,无尽
Circulate233 May 8, 2025
65fe7f1
更正手册文件路径
450J3E1 May 9, 2025
0b3d350
Merge pull request #10 from 450J3E1/Exemplum
Circulate233 May 9, 2025
a76d205
.....一点小意外
Circulate233 May 9, 2025
0909284
合并一些修复
Circulate233 May 9, 2025
a0490c0
合并代码
Circulate233 May 10, 2025
266b879
对样板供应器的特化:允许样板供应器内样板发配时自动翻倍到可发配上限,忽略并行处理单元(暂时的)
Circulate233 May 11, 2025
66d1063
注入点没打进去,奇怪,换个注入点
Circulate233 May 11, 2025
5e1181c
为样板供应器增加一个升级项目,用于允许忽略并行处理单元,并且默认上限被并行处理单元限制(目前始终启用忽略并行)
Circulate233 May 11, 2025
f08a2d4
修复有供应器的情况下所有样板均翻倍的异常执行问题
Circulate233 May 11, 2025
39a1c9c
修正翻倍导致的成品回收后才能进行下一次发配的问题
Circulate233 May 12, 2025
cb5146c
一个程序缺陷,奇妙
Circulate233 May 12, 2025
8a3fd45
对于nco的一个null错误修复
Circulate233 May 12, 2025
d56fe1e
性能优化
Circulate233 May 14, 2025
28b1bdc
防止一些NPE问题
Circulate233 May 14, 2025
cb8a904
调整对NCO的流体NPE修复的注入点
Circulate233 May 14, 2025
56aa360
愚蠢的一切
Circulate233 May 14, 2025
72b15dc
修改破魔附魔的工作逻辑
Circulate233 May 14, 2025
41cbe63
保存更改
Circulate233 May 15, 2025
8675c63
不再允许样板供应器发配忽略并行控制器,将EC的并行处理单元恢复到256,2048,16384(4,6,9)
Circulate233 May 15, 2025
ed25f75
可能修复了部分情况在查看IC2流体单元会直接崩溃的bug
Circulate233 May 16, 2025
ee0ee9d
对梦核的小小修改
Circulate233 May 23, 2025
185dcdc
批量设置Tag的辅助方法
Circulate233 May 28, 2025
3c76faf
我不知道发生了什么总之就是这样
Circulate233 May 28, 2025
20157fb
我不知道发生了什么总之就是这样2.0
Circulate233 May 28, 2025
bff3f29
整合辅助方法
Circulate233 May 31, 2025
e0c2b3d
一些修正
Circulate233 Jun 3, 2025
c89313a
完善梦之能量核心的bigint调用
Circulate233 Jun 3, 2025
105c13e
重置MM血之祭坛的配方系统,改为动态注册所有血之祭坛配方
Circulate233 Jun 3, 2025
923fe1b
坐标算法写错了(
Circulate233 Jun 4, 2025
a5ae48e
半成品的梦之能量核心专用通量端口
Circulate233 Jun 4, 2025
ad2c259
功能性完善
Circulate233 Jun 5, 2025
c479366
维修bug以及添加材质
Circulate233 Jun 5, 2025
5a148d0
修复一点小bug
Circulate233 Jun 6, 2025
f610fb1
封装NBT方法
Circulate233 Jun 19, 2025
5dcaf51
保证IDataUtils的安全性
Circulate233 Jun 20, 2025
a065f90
修复梦之能量端口的一些问题
Circulate233 Jun 24, 2025
138ff38
唉,通量,唉
Circulate233 Jun 25, 2025
528d7be
迁移通量bug修复
Circulate233 Jun 25, 2025
774e17c
更好的原始物质工厂配方注册(大概)
Circulate233 Jun 28, 2025
18c568a
生物演算的配方运行调整
Circulate233 Jun 28, 2025
fd624ca
允许在配置文件中关闭Java检查
Circulate233 Jun 29, 2025
c9db522
调整网络终端的研究显示顺序从 正在研究中 - 已研究 - 未研究 - 不可研究 改为 正在研究中 - 未研究 - 已研究 - 不可研究
Circulate233 Jun 30, 2025
1ca9e04
测试性的排序算法,试图让研究按难度从上至下显示
Circulate233 Jun 30, 2025
28d44d4
OVO
Circulate233 Jul 1, 2025
34bab18
重构虚相物质操纵的调用,修正矿词提取的一些错误
Circulate233 Jul 11, 2025
31bc3de
迁移zs内的魔力液化器修改为mixin
Circulate233 Jul 12, 2025
277fa8f
修复数据库在未通电的情况下仍然可被识别的问题
Circulate233 Jul 19, 2025
ef62ac6
重构一部分EF逻辑以进行性能优化
Circulate233 Jul 20, 2025
860aac5
修复合成样板为流体合成样板时的一些异常
Circulate233 Jul 21, 2025
b274e6f
非常呃呃的不消耗物品进行合成...
Circulate233 Jul 22, 2025
02c1a8c
删除计算机的计算组件的耐久设定
Circulate233 Jul 22, 2025
bbcbd7c
删除计算机的计算组件的耐久设定
Circulate233 Jul 29, 2025
38a82a2
允许水晶石矿石被精准采集挖掘,以及通过假玩家挖掘
Circulate233 Jul 29, 2025
e93704c
修正复制机JEI的一些错误
Circulate233 Aug 4, 2025
ef74656
修复一些小错误
Circulate233 Aug 6, 2025
dc38a6c
压缩图片以减少无意义的mod体积
Circulate233 Aug 16, 2025
b323f2f
一些调整
Circulate233 Aug 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ $RECYCLE.BIN/

.gradle
build/
run/

# Ignore Gradle GUI config
gradle-app.setting
Expand Down
72 changes: 56 additions & 16 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@ plugins {
id("org.jetbrains.gradle.plugin.idea-ext") version "1.1.7"
id("eclipse")
id("com.gtnewhorizons.retrofuturagradle") version "1.3.19"
kotlin("jvm")
}

// Project properties
group = "github.kasuminova.novaeng"
version = "1.21.1"
version = "1.22.5"

// Set the toolchain version to decouple the Java we run Gradle with from the Java used to compile and run the mod
java {
Expand Down Expand Up @@ -46,6 +47,8 @@ minecraft {
args.add("-Dmixin.hotSwap=true")
args.add("-Dmixin.checks.interfaces=true")
args.add("-Dmixin.debug.export=true")
//args.add("-Dlegacy.debugClassLoading=true")
//args.add("-Dlegacy.debugClassLoadingSave=true")
extraRunJvmArguments.addAll(args)

// If needed, add extra tweaker classes like for mixins.
Expand Down Expand Up @@ -167,6 +170,7 @@ repositories {
url = uri("http://jenkins.usrv.eu:8081/nexus/content/groups/public/")
isAllowInsecureProtocol = true
}
mavenCentral()
}

//mixin {
Expand Down Expand Up @@ -207,21 +211,36 @@ dependencies {

// Mod Dependencies
implementation("CraftTweaker2:CraftTweaker2-MC1120-Main:1.12-4.+")
implementation(rfg.deobf("hellfirepvp:modularmachinery:2.1.0:main"))
implementation(rfg.deobf("curse.maven:electroblobs-wizardry-265642:5354477"))
implementation(rfg.deobf("kasuminova:ModularMachinery-CE:2.1.6:dev"))
implementation(rfg.deobf("kasuminova:MMCE-ComponentModelHider:1.1:dev"))
implementation(rfg.deobf("lumien231:resourceloader:1.5.3:main"))
// implementation(rfg.deobf("curse.maven:modularmachinery-community-edition-817377:5255734"))
implementation(rfg.deobf("kasuminova:lumenized:1.0.3:dev"))
implementation(rfg.deobf("curse.maven:extended-crafting-terminals-for-applied-1157825:6503414"))
implementation(rfg.deobf("curse.maven:lumenized-1234162:6378222"))
implementation(rfg.deobf("curse.maven:mantle-74924:2713386"))
implementation(rfg.deobf("curse.maven:tinkers-construct-74072:2902483"))
implementation(rfg.deobf("curse.maven:not-enough-energistics-515565:5234732"))
implementation(rfg.deobf("curse.maven:psi-241665:3085917"))
implementation(rfg.deobf("curse.maven:RandomTweaker-514170:5528753"))
implementation(rfg.deobf("curse.maven:jetif-303122:2919936"))
implementation(rfg.deobf("curse.maven:ctm-267602:2915363"))
// implementation(rfg.deobf("curse.maven:component-model-hider-940949:4885858"))
implementation(rfg.deobf("curse.maven:had-enough-items-557549:4810661"))
implementation(rfg.deobf("curse.maven:the-one-probe-245211:2667280"))
implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:5378163"))
implementation(rfg.deobf("curse.maven:FTB-Library-237167:2985811"))
implementation(rfg.deobf("curse.maven:FTBU-237102:3157548"))
implementation(rfg.deobf("curse.maven:ae2-extended-life-570458:6302098"))
implementation(rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5504001"))
implementation(rfg.deobf("curse.maven:nae2-884359:4955559"))
compileOnly(rfg.deobf("curse.maven:MekanismEnergistics-1027681:5775101"))
implementation(rfg.deobf("curse.maven:nae2-884359:5380800"))
// implementation(rfg.deobf("curse.maven:applied-energistics-2-223794:2747063"))
// implementation(rfg.deobf("curse.maven:tx-loader-706505:4515357"))
implementation(rfg.deobf("curse.maven:CodeChickenLib-242818:2779848"))
implementation(rfg.deobf("curse.maven:wanionlib-253043:4623135"))
implementation(rfg.deobf("curse.maven:avaritia-1-1x-unofficial-1165010:6207893"))
implementation(rfg.deobf("curse.maven:eternal-singularity-253077:2922583"))
compileOnly(rfg.deobf("curse.maven:optifine-check-626981:3806565"))
compileOnly(rfg.deobf("curse.maven:nuclearcraft-overhauled-336895:3862197"))
compileOnly(rfg.deobf("curse.maven:industrialcraft-2-242638:3078604"))
// implementation(rfg.deobf("sddsd233:mekceu-9.8.11.185"))
Expand All @@ -231,39 +250,57 @@ dependencies {
implementation(rfg.deobf("curse.maven:botania-225643:3330934"))
implementation(rfg.deobf("curse.maven:astral-sorcery-241721:3044416"))
implementation(rfg.deobf("curse.maven:baubles-227083:2518667"))
implementation(rfg.deobf("curse.maven:zenutil-401178:5056679"))
implementation(rfg.deobf("curse.maven:zenutil-401178:6033519"))
compileOnly(rfg.deobf("curse.maven:smooth-font-285742:3944565"))
implementation(rfg.deobf("curse.maven:scalingguis-319656:2716334"))
implementation(rfg.deobf("curse.maven:lolasm-460609:5257348"))
compileOnly(rfg.deobf("curse.maven:matter-overdrive-community-edition-557428:4592069"))
compileOnly(rfg.deobf("curse.maven:cofh-core-69162:2920433"))
compileOnly(rfg.deobf("curse.maven:cofh-world-271384:2920434"))
compileOnly(rfg.deobf("curse.maven:thermal-foundation-222880:2926428"))
implementation(rfg.deobf("curse.maven:cofh-core-69162:2920433"))
implementation(rfg.deobf("curse.maven:cofh-world-271384:2920434"))
implementation(rfg.deobf("curse.maven:thermal-foundation-222880:2926428"))
compileOnly(rfg.deobf("curse.maven:thermal-innovation-291737:2920441"))
compileOnly(rfg.deobf("curse.maven:thermal-expansion-69163:2926431"))
compileOnly(rfg.deobf("curse.maven:tesla-244651:2487959"))
implementation(rfg.deobf("curse.maven:mcjtylib-233105:2745846"))
implementation(rfg.deobf("curse.maven:rftools-224641:2861573"))
implementation(rfg.deobf("curse.maven:thermal-expansion-69163:2926431"))
compileOnly(rfg.deobf("curse.maven:athenaeum-284350:4633750"))
compileOnly(rfg.deobf("curse.maven:artisan-worktables-284351:3205284"))
compileOnly(rfg.deobf("curse.maven:endercore-231868:4671384"))
compileOnly(rfg.deobf("curse.maven:ender-io-64578:4674244"))
compileOnly(rfg.deobf("curse.maven:more-electric-tools-366298:3491973"))
compileOnly(rfg.deobf("curse.maven:brandonscore-231382:3051539"))
compileOnly(rfg.deobf("curse.maven:draconicevolution-223565:3051542"))
compileOnly(rfg.deobf("curse.maven:extrabotany-299086:3112313"))
compileOnly(rfg.deobf("curse.maven:libnine-322344:3509087"))
compileOnly(rfg.deobf("curse.maven:lazy-ae2-322347:3254160"))
implementation(rfg.deobf("curse.maven:extrabotany-299086:3112313"))
implementation(rfg.deobf("curse.maven:libnine-322344:3509087"))
implementation(rfg.deobf("curse.maven:lazy-ae2-322347:3254160"))
compileOnly(rfg.deobf("curse.maven:better-chat-363860:3048407"))
compileOnly(rfg.deobf("curse.maven:ae2-fluid-crafting-rework-623955:5237484"))
compileOnly(rfg.deobf("curse.maven:ingame-info-xml-225604:2489566"))
compileOnly(rfg.deobf("curse.maven:lunatriuscore-225605:2489549"))
compileOnly(rfg.deobf("curse.maven:immersive-engineering-231951:2974106"))
compileOnly(rfg.deobf("curse.maven:ingame-info-xml-225604:2489566"))
compileOnly(rfg.deobf("curse.maven:unidict-244258:3553627"))
compileOnly(rfg.deobf("curse.maven:wanionlib-253043:4623135"))
compileOnly(rfg.deobf("curse.maven:dme-737252:5043404"))
// Performance Test Tool
runtimeOnly(rfg.deobf("curse.maven:spark-361579:3245793"))
// Optimization
implementation(rfg.deobf("curse.maven:stellarcore-1064321:5791405"))
implementation(rfg.deobf("curse.maven:stellarcore-1064321:5952608"))
implementation(rfg.deobf("curse.maven:configanytime-870276:5212709"))
implementation(rfg.deobf("curse.maven:LibVulpes-236541:3801015"))
implementation(rfg.deobf("curse.maven:AutoRegLib-250363:2746011"))
implementation(rfg.deobf("curse.maven:Cucumber-272335:2645867"))
implementation(rfg.deobf("curse.maven:LibVulpes-236541:3801015"))
implementation(rfg.deobf("curse.maven:extended-crafting-nomifactory-edition-398267:5778512"))
implementation(rfg.deobf("curse.maven:techguns-244201:2958103"))
implementation(rfg.deobf("curse.maven:legendary-tooltips-532127:5734973"))
implementation(rfg.deobf("curse.maven:betterer-p2p-943734:4928154"))
implementation(rfg.deobf("curse.maven:nuclearcraft-overhauled-336895:6605808"))
implementation(rfg.deobf("curse.maven:Loot-Overhaul-299389:2711740"))
implementation(rfg.deobf("curse.maven:Flux-Networks-248020:3178199"))
implementation(rfg.deobf("curse.maven:BloodMagic-224791:2822288"))
implementation(rfg.deobf("curse.maven:dme-737252:5985530"))
implementation(rfg.deobf("curse.maven:packagedauto-308380:6312996"))
implementation(kotlin("stdlib-jdk8"))
}

// Publishing to a Maven repository
Expand Down Expand Up @@ -317,6 +354,9 @@ idea {
self.add(Gradle("4. Run Obfuscated Server").apply {
setProperty("taskNames", listOf("runObfServer"))
})
self.add(Gradle("5. Build Jars").apply {
setProperty("taskNames", listOf("build"))
})
/*
These require extra configuration in IntelliJ, so are not enabled by default
self.add(Application("Run Client (IJ Native, Deprecated)", project).apply {
Expand Down Expand Up @@ -350,7 +390,7 @@ idea {
afterEvaluate {
self.javac.moduleJavacAdditionalOptions = mapOf(
(project.name + ".main") to
tasks.compileJava.get().options.compilerArgs.map { '"' + it + '"' }.joinToString(" ")
tasks.compileJava.get().options.compilerArgs.joinToString(" ") { '"' + it + '"' }
)
}
}
Expand Down
Binary file not shown.
Binary file removed lib/lumenized-1.0.3-dev.jar
Binary file not shown.
Binary file removed libs/ModularMachinery-CE-2.0.0-pre3.jar
Binary file not shown.
3 changes: 3 additions & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ pluginManagement {
mavenCentral()
mavenLocal()
}
plugins {
kotlin("jvm") version "2.1.20"
}
}

plugins {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,7 @@ public class DragBarButton extends DynamicWidget {
protected ResourceLocation texLocation = DEFAULT_TEX_RES;

protected float width = 0;
protected float height = 0;
protected float height;

protected int buttonLeftTexOffsetX = DEFAULT_BUTTON_LEFT_TEX_OFFSET_X;
protected int buttonLeftTexOffsetY = DEFAULT_BUTTON_LEFT_TEX_OFFSET_Y;
Expand Down
44 changes: 36 additions & 8 deletions src/main/java/github/kasuminova/novaeng/NovaEngineeringCore.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,41 @@

import github.kasuminova.novaeng.client.hitokoto.HitokotoAPI;
import github.kasuminova.novaeng.common.CommonProxy;
import github.kasuminova.novaeng.common.command.CommandBuilder;
import github.kasuminova.novaeng.common.command.CommandSPacketProfiler;
import github.kasuminova.novaeng.common.config.NovaEngCoreConfig;
import github.kasuminova.novaeng.common.network.*;
import github.kasuminova.novaeng.common.handler.WorldLoadedHandler;
import github.kasuminova.novaeng.common.network.ParallelNetworkManager;
import github.kasuminova.novaeng.common.network.PktCellDriveStatusUpdate;
import github.kasuminova.novaeng.common.network.PktECalculatorGUIData;
import github.kasuminova.novaeng.common.network.PktEFabricatorGUIAction;
import github.kasuminova.novaeng.common.network.PktEFabricatorGUIData;
import github.kasuminova.novaeng.common.network.PktEFabricatorPatternSearchGUIAction;
import github.kasuminova.novaeng.common.network.PktEFabricatorPatternSearchGUIUpdate;
import github.kasuminova.novaeng.common.network.PktEFabricatorWorkerStatusUpdate;
import github.kasuminova.novaeng.common.network.PktEStorageGUIData;
import github.kasuminova.novaeng.common.network.PktGeocentricDrillControl;
import github.kasuminova.novaeng.common.network.PktHyperNetStatus;
import github.kasuminova.novaeng.common.network.PktMouseItemUpdate;
import github.kasuminova.novaeng.common.network.PktPatternTermUploadPattern;
import github.kasuminova.novaeng.common.network.PktResearchTaskComplete;
import github.kasuminova.novaeng.common.network.PktResearchTaskProvide;
import github.kasuminova.novaeng.common.network.PktResearchTaskProvideCreative;
import github.kasuminova.novaeng.common.network.PktResearchTaskReset;
import github.kasuminova.novaeng.common.network.PktTerminalGuiData;
import github.kasuminova.novaeng.common.network.packetprofiler.PktCProfilerReply;
import github.kasuminova.novaeng.common.network.packetprofiler.PktCProfilerRequest;
import github.kasuminova.novaeng.common.profiler.SPacketProfiler;
import net.minecraft.util.text.TextFormatting;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.SidedProxy;
import net.minecraftforge.fml.common.event.*;
import net.minecraftforge.fml.common.event.FMLConstructionEvent;
import net.minecraftforge.fml.common.event.FMLInitializationEvent;
import net.minecraftforge.fml.common.event.FMLLoadCompleteEvent;
import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
import net.minecraftforge.fml.common.event.FMLServerStoppingEvent;
import net.minecraftforge.fml.common.network.NetworkRegistry;
import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
import net.minecraftforge.fml.relauncher.Side;
Expand All @@ -31,7 +56,7 @@
"required:mixinbooter@[8.0,);" +
"required:lumenized@[1.0.2,);",
acceptedMinecraftVersions = "[1.12, 1.13)",
acceptableRemoteVersions = "[1.21.0, 1.22.0)"
acceptableRemoteVersions = "[1.21.7, 1.23.0)"
)
@SuppressWarnings("MethodMayBeStatic")
public class NovaEngineeringCore {
Expand Down Expand Up @@ -60,7 +85,7 @@ public class NovaEngineeringCore {
if (hitokoto == null || hitokoto.isEmpty()) {
return;
}
LOG.info(LOG_PREFIX + hitokoto);
LOG.info(LOG_PREFIX + "{}", hitokoto);
});
thread.setName("NovaEng Core Hitokoto Initializer");
thread.start();
Expand All @@ -72,13 +97,12 @@ public void construction(FMLConstructionEvent event) {
proxy.construction();
}

@SuppressWarnings("ValueOfIncrementOrDecrementUsed")
@SuppressWarnings({"ValueOfIncrementOrDecrementUsed", "UnusedAssignment"})
@Mod.EventHandler
public void preInit(FMLPreInitializationEvent event) {
event.getModMetadata().version = VERSION;

byte start = 0;

NET_CHANNEL.registerMessage(PktHyperNetStatus.class, PktHyperNetStatus.class, start++, Side.CLIENT);
NET_CHANNEL.registerMessage(PktTerminalGuiData.class, PktTerminalGuiData.class, start++, Side.CLIENT);
NET_CHANNEL.registerMessage(PktResearchTaskComplete.class, PktResearchTaskComplete.class, start++, Side.CLIENT);
Expand Down Expand Up @@ -124,15 +148,19 @@ public void loadComplete(FMLLoadCompleteEvent event) {
@Mod.EventHandler
public void onServerStart(FMLServerStartingEvent event) {
event.registerServerCommand(CommandSPacketProfiler.INSTANCE);
event.registerServerCommand(CommandBuilder.INSTANCE);
WorldLoadedHandler.REGISTERED_DIMENSIONS.clear();
WorldLoadedHandler.ERRORWROLD.clear();
WorldLoadedHandler.init = true;
}

@Mod.EventHandler
public void onServerStopping(FMLServerStoppingEvent event) {
log.info(TextFormatting.BLUE + "服务器正在关闭,正在生成网络包报告。");
log.info("{}服务器正在关闭,正在生成网络包报告。", TextFormatting.BLUE);
for (final String message : SPacketProfiler.getProfilerMessages()) {
log.info(message);
}
log.info(TextFormatting.BLUE + "所有玩家的完整网络包报告:");
log.info("{}所有玩家的完整网络包报告:", TextFormatting.BLUE);
for (final String message : SPacketProfiler.getFullProfilerMessages()) {
log.info(message);
}
Expand Down
39 changes: 37 additions & 2 deletions src/main/java/github/kasuminova/novaeng/client/ClientProxy.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
package github.kasuminova.novaeng.client;


import github.kasuminova.mmce.client.renderer.MachineControllerRenderer;
import github.kasuminova.novaeng.client.gui.*;
import github.kasuminova.novaeng.client.book.BookTransformerAppendModifiers;
import github.kasuminova.novaeng.client.gui.GuiECalculatorController;
import github.kasuminova.novaeng.client.gui.GuiEFabricatorController;
import github.kasuminova.novaeng.client.gui.GuiEFabricatorPatternBus;
import github.kasuminova.novaeng.client.gui.GuiEFabricatorPatternSearch;
import github.kasuminova.novaeng.client.gui.GuiEStorageController;
import github.kasuminova.novaeng.client.gui.GuiGeocentricDrill;
import github.kasuminova.novaeng.client.gui.GuiHyperNetTerminal;
import github.kasuminova.novaeng.client.gui.GuiModularServerAssembler;
import github.kasuminova.novaeng.client.gui.GuiSingularityCore;
import github.kasuminova.novaeng.client.handler.BlockAngelRendererHandler;
import github.kasuminova.novaeng.client.handler.ClientEventHandler;
import github.kasuminova.novaeng.client.handler.HyperNetClientEventHandler;
import github.kasuminova.novaeng.client.util.ExJEI;
import github.kasuminova.novaeng.client.util.TitleUtils;
import github.kasuminova.novaeng.common.CommonProxy;
import github.kasuminova.novaeng.common.command.CommandPacketProfiler;
Expand All @@ -29,12 +38,19 @@
import net.minecraftforge.client.ClientCommandHandler;
import net.minecraftforge.client.event.ModelRegistryEvent;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.config.Configuration;
import net.minecraftforge.fml.client.registry.ClientRegistry;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.fml.common.Mod;
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
import net.minecraftforge.fml.relauncher.Side;
import slimeknights.tconstruct.library.book.TinkerBook;

import javax.annotation.Nullable;
import java.io.File;

import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.checkJavaVersion;
import static github.kasuminova.novaeng.mixin.NovaEngCoreEarlyMixinLoader.isCleanroomLoader;

@SuppressWarnings("MethodMayBeStatic")
@Mod.EventBusSubscriber(Side.CLIENT)
Expand All @@ -48,6 +64,15 @@ public ClientProxy() {
public void construction() {
super.construction();

var config = new Configuration(new File(Loader.instance().getConfigDir(), "novaeng_core.cfg"));
config.load();
if (config.getBoolean("javaCheck", Configuration.CATEGORY_GENERAL,true,"java1.8.0_51 is bad")) {
if (!isCleanroomLoader()){
checkJavaVersion();
}
}
config.save();

TitleUtils.setRandomTitle("*Construction*");
}

Expand All @@ -70,6 +95,10 @@ public void init() {
super.init();

TitleUtils.setRandomTitle("*Init*");

if (Loader.isModLoaded("ic2")) {
ExJEI.jeiCreate();
}
}

@Override
Expand All @@ -80,6 +109,12 @@ public void postInit() {
ClientCommandHandler.instance.registerCommand(CommandPacketProfiler.INSTANCE);

TitleUtils.setRandomTitle("*PostInit*");

if (Loader.isModLoaded("ic2")) {
ExJEI.jeiRecipeRegister();
}

TinkerBook.INSTANCE.addTransformer(BookTransformerAppendModifiers.INSTANCE_FALSE);
}

@Override
Expand Down
Loading