From af12476d7b306eaa56ffc626e279c15a0d59cbed Mon Sep 17 00:00:00 2001
From: m2r1k5 <61507029+m2r1k5@users.noreply.github.com>
Date: Sun, 23 Jan 2022 23:55:51 +0800
Subject: [PATCH] qb, nq reactor fix, more fix
---
config/betterquesting/DefaultQuests.json | 120 ++++++
config/jei/worldSettings.cfg | 2 +-
config/splash.properties | 4 +-
manifest.json | 470 +----------------------
modlist.html | 2 +-
scripts/multiblocks.zs | 8 +-
6 files changed, 131 insertions(+), 475 deletions(-)
create mode 100644 config/betterquesting/DefaultQuests.json
diff --git a/config/betterquesting/DefaultQuests.json b/config/betterquesting/DefaultQuests.json
new file mode 100644
index 0000000..b5a4609
--- /dev/null
+++ b/config/betterquesting/DefaultQuests.json
@@ -0,0 +1,120 @@
+{
+ "questSettings:10": {
+ "betterquesting:10": {
+ "editmode:1": 1,
+ "hardcore:1": 0,
+ "home_anchor_x:5": 0.5,
+ "home_anchor_y:5": 0.0,
+ "home_image:8": "betterquesting:textures/gui/default_title.png",
+ "home_offset_x:3": -128,
+ "home_offset_y:3": 0,
+ "livesdef:3": 3,
+ "livesmax:3": 10,
+ "pack_name:8": "",
+ "pack_version:3": 0,
+ "party_enable:1": 1
+ }
+ },
+ "questDatabase:9": {
+ "0:10": {
+ "properties:10": {
+ "betterquesting:10": {
+ "name:8": "Nomi-CEu",
+ "desc:8": "This is a port of Nomifactory 1.3 to the GregTech Community Unofficial (GTCEu) generation of GT mods.\n\nThe progression has been kept mostly the same, with certain improvements native to GTCEu.\n\nAn extensive questbook is not planned. Here are some of the major changes:\n- GTCEu does not have any RF -\u003e EU conversion support yet. However, GT cables can natively supply RF at 4:1. For power generation, use native GT power, the Large Lapidary Dynamo and the conversion recipes from SFR Solar Panels to GT Solar Panels.\n- The circuit progression used is CEu\u0027s native one.\n- Many items from Scannable, Lumberaxe, More Plates, ContentTweaker and other such mods were changed to native CEu implementations.\n\nEnjoy! - §em2r1k5",
+ "icon:10": {
+ "id:8": "minecraft:nether_star",
+ "Count:3": 1,
+ "Damage:2": 0,
+ "OreDict:8": ""
+ },
+ "snd_complete:8": "minecraft:entity.player.levelup",
+ "snd_update:8": "minecraft:entity.player.levelup",
+ "questlogic:8": "AND",
+ "tasklogic:8": "AND",
+ "repeattime:3": -1,
+ "repeat_relative:1": 1,
+ "lockedprogress:1": 0,
+ "autoclaim:1": 0,
+ "issilent:1": 0,
+ "ismain:1": 0,
+ "globalshare:1": 0,
+ "simultaneous:1": 0,
+ "visibility:8": "NORMAL"
+ }
+ },
+ "tasks:9": {
+ "0:10": {
+ "taskID:8": "bq_standard:checkbox",
+ "index:3": 0
+ }
+ },
+ "rewards:9": {
+ "0:10": {
+ "rewards:9": {
+ "0:10": {
+ "id:8": "contenttweaker:omnicoin100",
+ "Count:3": 2,
+ "Damage:2": 0,
+ "OreDict:8": ""
+ },
+ "1:10": {
+ "id:8": "gregtech:meta_tool",
+ "Count:3": 4,
+ "Damage:2": 19,
+ "tag:10": {
+ "GT.ToolStats:10": {
+ "Material:8": "diamond"
+ }
+ },
+ "OreDict:8": ""
+ },
+ "2:10": {
+ "id:8": "gregtech:meta_item_1",
+ "Count:3": 1,
+ "Damage:2": 467,
+ "tag:10": {
+ "Charge:4": 1600000
+ },
+ "OreDict:8": ""
+ }
+ },
+ "rewardID:8": "bq_standard:item",
+ "index:3": 0
+ }
+ },
+ "preRequisites:11": [],
+ "questID:3": 0
+ }
+ },
+ "questLines:9": {
+ "0:10": {
+ "properties:10": {
+ "betterquesting:10": {
+ "name:8": "Nomi-CEu",
+ "desc:8": "No Description",
+ "icon:10": {
+ "id:8": "minecraft:book",
+ "Count:3": 1,
+ "Damage:2": 0,
+ "OreDict:8": ""
+ },
+ "visibility:8": "NORMAL",
+ "bg_image:8": "",
+ "bg_size:3": 256
+ }
+ },
+ "quests:9": {
+ "0:10": {
+ "sizeX:3": 24,
+ "sizeY:3": 24,
+ "x:3": 0,
+ "y:3": 0,
+ "id:3": 0
+ }
+ },
+ "lineID:3": 0,
+ "order:3": 0
+ }
+ },
+ "format:8": "2.0.0"
+}
\ No newline at end of file
diff --git a/config/jei/worldSettings.cfg b/config/jei/worldSettings.cfg
index 976611d..6455df6 100644
--- a/config/jei/worldSettings.cfg
+++ b/config/jei/worldSettings.cfg
@@ -25,7 +25,7 @@ world1855637915 {
# Hide and unhide ingredients by clicking them in the list.
B:editEnabled=false
- S:filterText=steel ingot
+ S:filterText=loot fa
# Show the list of ingredients next to open GUIs.
B:overlayEnabled=true
diff --git a/config/splash.properties b/config/splash.properties
index a40678c..392183a 100644
--- a/config/splash.properties
+++ b/config/splash.properties
@@ -1,5 +1,5 @@
#Splash screen properties
-#Sun Jan 23 23:16:49 SGT 2022
+#Sun Jan 23 23:48:44 SGT 2022
background=0x837793
memoryGood=0x78CB34
font=0x0
@@ -9,8 +9,8 @@ memoryLow=0xE42F2F
rotate=false
memoryWarn=0xE6E84A
showMemory=true
-bar=0xCB3D35
enabled=true
+bar=0xCB3D35
resourcePackPath=resources
logoOffset=0
forgeTexture=fml\:textures/gui/forge.png
diff --git a/manifest.json b/manifest.json
index d3ec893..cdfdce9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,469 +1 @@
-{
- "minecraft": {
- "version": "1.12.2",
- "modLoaders": [
- {
- "id": "forge-14.23.5.2860",
- "primary": true
- }
- ]
- },
- "manifestType": "minecraftModpack",
- "overrides": "overrides",
- "manifestVersion": 1,
- "version": "0.1",
- "author": "__tracer",
- "name": "nomi-ceu",
- "files": [
- {
- "projectID": 60089,
- "fileID": 2671937,
- "required": true
- },
- {
- "projectID": 248787,
- "fileID": 2987247,
- "required": true
- },
- {
- "projectID": 250363,
- "fileID": 2746011,
- "required": true
- },
- {
- "projectID": 256717,
- "fileID": 2666198,
- "required": true
- },
- {
- "projectID": 306770,
- "fileID": 3162874,
- "required": true
- },
- {
- "projectID": 32274,
- "fileID": 2916002,
- "required": true
- },
- {
- "projectID": 223852,
- "fileID": 2952606,
- "required": true
- },
- {
- "projectID": 267602,
- "fileID": 2915363,
- "required": true
- },
- {
- "projectID": 230497,
- "fileID": 2450900,
- "required": true
- },
- {
- "projectID": 240630,
- "fileID": 2728585,
- "required": true
- },
- {
- "projectID": 239197,
- "fileID": 3587830,
- "required": true
- },
- {
- "projectID": 242818,
- "fileID": 2779848,
- "required": true
- },
- {
- "projectID": 250419,
- "fileID": 2689502,
- "required": true
- },
- {
- "projectID": 238222,
- "fileID": 3043174,
- "required": true
- },
- {
- "projectID": 235279,
- "fileID": 2915375,
- "required": true
- },
- {
- "projectID": 288885,
- "fileID": 2838777,
- "required": true
- },
- {
- "projectID": 283644,
- "fileID": 2694382,
- "required": true
- },
- {
- "projectID": 237065,
- "fileID": 3331364,
- "required": true
- },
- {
- "projectID": 246996,
- "fileID": 3440963,
- "required": true
- },
- {
- "projectID": 398267,
- "fileID": 3613140,
- "required": true
- },
- {
- "projectID": 272335,
- "fileID": 2645867,
- "required": true
- },
- {
- "projectID": 245211,
- "fileID": 2667280,
- "required": true
- },
- {
- "projectID": 564858,
- "fileID": 3612876,
- "required": true
- },
- {
- "projectID": 292785,
- "fileID": 2915154,
- "required": true
- },
- {
- "projectID": 278494,
- "fileID": 3327893,
- "required": true
- },
- {
- "projectID": 278799,
- "fileID": 2833002,
- "required": true
- },
- {
- "projectID": 228404,
- "fileID": 3117927,
- "required": true
- },
- {
- "projectID": 225561,
- "fileID": 2678374,
- "required": true
- },
- {
- "projectID": 245174,
- "fileID": 2755787,
- "required": true
- },
- {
- "projectID": 391401,
- "fileID": 3613142,
- "required": true
- },
- {
- "projectID": 225194,
- "fileID": 2491032,
- "required": true
- },
- {
- "projectID": 70496,
- "fileID": 2518031,
- "required": true
- },
- {
- "projectID": 244559,
- "fileID": 2830252,
- "required": true
- },
- {
- "projectID": 255232,
- "fileID": 2830265,
- "required": true
- },
- {
- "projectID": 304024,
- "fileID": 2830114,
- "required": true
- },
- {
- "projectID": 570458,
- "fileID": 3616360,
- "required": true
- },
- {
- "projectID": 223565,
- "fileID": 3431261,
- "required": true
- },
- {
- "projectID": 270789,
- "fileID": 2920436,
- "required": true
- },
- {
- "projectID": 231382,
- "fileID": 3408276,
- "required": true
- },
- {
- "projectID": 236542,
- "fileID": 3015079,
- "required": true
- },
- {
- "projectID": 236541,
- "fileID": 3611363,
- "required": true
- },
- {
- "projectID": 237366,
- "fileID": 2952741,
- "required": true
- },
- {
- "projectID": 248055,
- "fileID": 2580332,
- "required": true
- },
- {
- "projectID": 222880,
- "fileID": 2926428,
- "required": true
- },
- {
- "projectID": 271384,
- "fileID": 2920434,
- "required": true
- },
- {
- "projectID": 69162,
- "fileID": 2920433,
- "required": true
- },
- {
- "projectID": 284229,
- "fileID": 2968355,
- "required": true
- },
- {
- "projectID": 69163,
- "fileID": 2926431,
- "required": true
- },
- {
- "projectID": 64578,
- "fileID": 3328811,
- "required": true
- },
- {
- "projectID": 231868,
- "fileID": 2972849,
- "required": true
- },
- {
- "projectID": 308380,
- "fileID": 3614585,
- "required": true
- },
- {
- "projectID": 322861,
- "fileID": 3214400,
- "required": true
- },
- {
- "projectID": 297209,
- "fileID": 2607310,
- "required": true
- },
- {
- "projectID": 252910,
- "fileID": 3041340,
- "required": true
- },
- {
- "projectID": 227083,
- "fileID": 2518667,
- "required": true
- },
- {
- "projectID": 248453,
- "fileID": 2785465,
- "required": true
- },
- {
- "projectID": 226254,
- "fileID": 3328174,
- "required": true
- },
- {
- "projectID": 251792,
- "fileID": 3294422,
- "required": true
- },
- {
- "projectID": 266736,
- "fileID": 2668113,
- "required": true
- },
- {
- "projectID": 304920,
- "fileID": 2669468,
- "required": true
- },
- {
- "projectID": 70631,
- "fileID": 2939416,
- "required": true
- },
- {
- "projectID": 269024,
- "fileID": 2861574,
- "required": true
- },
- {
- "projectID": 314904,
- "fileID": 2819669,
- "required": true
- },
- {
- "projectID": 237102,
- "fileID": 3157548,
- "required": true
- },
- {
- "projectID": 237167,
- "fileID": 2985811,
- "required": true
- },
- {
- "projectID": 220954,
- "fileID": 3488553,
- "required": true
- },
- {
- "projectID": 253211,
- "fileID": 3308160,
- "required": true
- },
- {
- "projectID": 238747,
- "fileID": 2739582,
- "required": true
- },
- {
- "projectID": 242106,
- "fileID": 2539562,
- "required": true
- },
- {
- "projectID": 261348,
- "fileID": 3143349,
- "required": true
- },
- {
- "projectID": 271835,
- "fileID": 2920437,
- "required": true
- },
- {
- "projectID": 313141,
- "fileID": 2675884,
- "required": true
- },
- {
- "projectID": 246974,
- "fileID": 3050838,
- "required": true
- },
- {
- "projectID": 304346,
- "fileID": 3328808,
- "required": true
- },
- {
- "projectID": 279172,
- "fileID": 2491542,
- "required": true
- },
- {
- "projectID": 241344,
- "fileID": 2480458,
- "required": true
- },
- {
- "projectID": 291737,
- "fileID": 2920441,
- "required": true
- },
- {
- "projectID": 252354,
- "fileID": 2464501,
- "required": true
- },
- {
- "projectID": 243146,
- "fileID": 2540650,
- "required": true
- },
- {
- "projectID": 257573,
- "fileID": 3248033,
- "required": true
- },
- {
- "projectID": 557242,
- "fileID": 3614219,
- "required": true
- },
- {
- "projectID": 302113,
- "fileID": 2847346,
- "required": true
- },
- {
- "projectID": 250832,
- "fileID": 2845365,
- "required": true
- },
- {
- "projectID": 242223,
- "fileID": 3524685,
- "required": true
- },
- {
- "projectID": 254317,
- "fileID": 2932048,
- "required": true
- },
- {
- "projectID": 254268,
- "fileID": 3529742,
- "required": true
- },
- {
- "projectID": 386188,
- "fileID": 3617282,
- "required": true
- },
- {
- "projectID": 238857,
- "fileID": 2863771,
- "required": true
- },
- {
- "projectID": 423758,
- "fileID": 3564705,
- "required": true
- },
- {
- "projectID": 238856,
- "fileID": 2950248,
- "required": true
- }
- ]
- }
\ No newline at end of file
+{"minecraft":{"version":"1.12.2","modLoaders":[{"id":"forge-14.23.5.2860","primary":true}]},"manifestType":"minecraftModpack","overrides":"overrides","manifestVersion":1,"version":"0.1.1","author":"__tracer","name":"nomi-ceu","files":[{"projectID":60089,"fileID":2671937,"required":true},{"projectID":248787,"fileID":2987247,"required":true},{"projectID":250363,"fileID":2746011,"required":true},{"projectID":256717,"fileID":2666198,"required":true},{"projectID":306770,"fileID":3162874,"required":true},{"projectID":32274,"fileID":2916002,"required":true},{"projectID":223852,"fileID":2952606,"required":true},{"projectID":267602,"fileID":2915363,"required":true},{"projectID":230497,"fileID":2450900,"required":true},{"projectID":240630,"fileID":2728585,"required":true},{"projectID":239197,"fileID":3587830,"required":true},{"projectID":242818,"fileID":2779848,"required":true},{"projectID":250419,"fileID":2689502,"required":true},{"projectID":238222,"fileID":3043174,"required":true},{"projectID":235279,"fileID":2915375,"required":true},{"projectID":288885,"fileID":2838777,"required":true},{"projectID":283644,"fileID":2694382,"required":true},{"projectID":237065,"fileID":3331364,"required":true},{"projectID":246996,"fileID":3440963,"required":true},{"projectID":398267,"fileID":3613140,"required":true},{"projectID":272335,"fileID":2645867,"required":true},{"projectID":245211,"fileID":2667280,"required":true},{"projectID":564858,"fileID":3612876,"required":true},{"projectID":292785,"fileID":2915154,"required":true},{"projectID":278494,"fileID":3327893,"required":true},{"projectID":278799,"fileID":2833002,"required":true},{"projectID":228404,"fileID":3117927,"required":true},{"projectID":225561,"fileID":2678374,"required":true},{"projectID":245174,"fileID":2755787,"required":true},{"projectID":391401,"fileID":3613142,"required":true},{"projectID":225194,"fileID":2491032,"required":true},{"projectID":70496,"fileID":2518031,"required":true},{"projectID":244559,"fileID":2830252,"required":true},{"projectID":255232,"fileID":2830265,"required":true},{"projectID":304024,"fileID":2830114,"required":true},{"projectID":570458,"fileID":3616360,"required":true},{"projectID":223565,"fileID":3431261,"required":true},{"projectID":270789,"fileID":2920436,"required":true},{"projectID":231382,"fileID":3408276,"required":true},{"projectID":236542,"fileID":3015079,"required":true},{"projectID":236541,"fileID":3611363,"required":true},{"projectID":237366,"fileID":2952741,"required":true},{"projectID":248055,"fileID":2580332,"required":true},{"projectID":222880,"fileID":2926428,"required":true},{"projectID":271384,"fileID":2920434,"required":true},{"projectID":69162,"fileID":2920433,"required":true},{"projectID":284229,"fileID":2968355,"required":true},{"projectID":69163,"fileID":2926431,"required":true},{"projectID":64578,"fileID":3328811,"required":true},{"projectID":231868,"fileID":2972849,"required":true},{"projectID":308380,"fileID":3614585,"required":true},{"projectID":322861,"fileID":3214400,"required":true},{"projectID":297209,"fileID":2607310,"required":true},{"projectID":252910,"fileID":3041340,"required":true},{"projectID":227083,"fileID":2518667,"required":true},{"projectID":248453,"fileID":2785465,"required":true},{"projectID":226254,"fileID":3328174,"required":true},{"projectID":251792,"fileID":3294422,"required":true},{"projectID":266736,"fileID":2668113,"required":true},{"projectID":304920,"fileID":2669468,"required":true},{"projectID":70631,"fileID":2939416,"required":true},{"projectID":269024,"fileID":2861574,"required":true},{"projectID":314904,"fileID":2819669,"required":true},{"projectID":237102,"fileID":3157548,"required":true},{"projectID":237167,"fileID":2985811,"required":true},{"projectID":220954,"fileID":3488553,"required":true},{"projectID":253211,"fileID":3308160,"required":true},{"projectID":238747,"fileID":2739582,"required":true},{"projectID":242106,"fileID":2539562,"required":true},{"projectID":261348,"fileID":3143349,"required":true},{"projectID":271835,"fileID":2920437,"required":true},{"projectID":313141,"fileID":2675884,"required":true},{"projectID":246974,"fileID":3050838,"required":true},{"projectID":304346,"fileID":3328808,"required":true},{"projectID":279172,"fileID":2491542,"required":true},{"projectID":241344,"fileID":2480458,"required":true},{"projectID":291737,"fileID":2920441,"required":true},{"projectID":252354,"fileID":2464501,"required":true},{"projectID":243146,"fileID":2540650,"required":true},{"projectID":257573,"fileID":3248033,"required":true},{"projectID":557242,"fileID":3614219,"required":true},{"projectID":302113,"fileID":2847346,"required":true},{"projectID":250832,"fileID":2845365,"required":true},{"projectID":242223,"fileID":3524685,"required":true},{"projectID":254317,"fileID":2932048,"required":true},{"projectID":254268,"fileID":3529742,"required":true},{"projectID":386188,"fileID":3617282,"required":true},{"projectID":238857,"fileID":2863771,"required":true},{"projectID":423758,"fileID":3564705,"required":true},{"projectID":238856,"fileID":2950248,"required":true}]}
diff --git a/modlist.html b/modlist.html
index 9b4de74..61111cb 100644
--- a/modlist.html
+++ b/modlist.html
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/scripts/multiblocks.zs b/scripts/multiblocks.zs
index 70dad38..e73f54f 100644
--- a/scripts/multiblocks.zs
+++ b/scripts/multiblocks.zs
@@ -255,7 +255,9 @@ val naquadah_reactor_1 = Builder.start("naquadah_reactor_1")
.where('P', )
.where('O', )
.where('C', CTPredicate.states()
- | controller.autoAbilities(true, false, true, true, false, false, false))
+ | CTPredicate.abilities().setMinGlobalLimited(1).setPreviewCount(1)
+ | CTPredicate.abilities().setMinGlobalLimited(1).setMaxGlobalLimited(3).setPreviewCount(1)
+ )
.build();
} as IPatternBuilderFunction)
.withRecipeMap(
@@ -302,7 +304,9 @@ val naquadah_reactor_2 = Builder.start("naquadah_reactor_2")
.where('P', )
.where('O', )
.where('C', CTPredicate.states()
- | controller.autoAbilities(true, false, true, true, false, false, false))
+ | CTPredicate.abilities().setMinGlobalLimited(1).setPreviewCount(1)
+ | CTPredicate.abilities().setMinGlobalLimited(1).setMaxGlobalLimited(3).setPreviewCount(1)
+ )
.build();
} as IPatternBuilderFunction)
.withRecipeMap(