Release: 0.5.1

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [0.5.1]
+### Changes
+- Added a block that stores the daily market data in it, for use with computercraft
+- Made mining gadget tiers freely cyclable in crafting
+- Fixed shulker tooltips
+- Fixed boiler research stage not working
+- Fixed research quest not consuming currency
+- Add longer chat history & persistence mods
+
 ## [0.5.0]
 ### Changes
 - Fixed market randomization not happening on first day of world creation

config/crash_assistant/modlist.json

@@ -482,6 +482,14 @@
     "curseForgeHash": 361198542,
     "modrinthHash": "99bf8e0f4dce30384d9aa2094a750f7aadb548c3"
   },
+  "DontClearChatHistory-1.jar": {
+    "jarName": "DontClearChatHistory-1.jar",
+    "modId": "dcch",
+    "name": "Dont Clear Chat History",
+    "version": "1",
+    "curseForgeHash": 3403112640,
+    "modrinthHash": "a6e532823419a509b7ef9dba7d252eaa19d49b34"
+  },
   "doublejump-1.0.0.jar": {
     "jarName": "doublejump-1.0.0.jar",
     "modId": "doublejump",
@@ -522,14 +530,6 @@
     "curseForgeHash": 1186236462,
     "modrinthHash": "9bfb5d63ac2e03ecdab8755c968ffa25b799469b"
   },
-  "EasyShulkerBoxes-v8.0.2-1.20.1-Forge.jar": {
-    "jarName": "EasyShulkerBoxes-v8.0.2-1.20.1-Forge.jar",
-    "modId": "easyshulkerboxes",
-    "name": "Easy Shulker Boxes",
-    "version": "8.0.2",
-    "curseForgeHash": 2149531480,
-    "modrinthHash": "c5245255c422afa2d627e89bbbf4a2f1d5d721e8"
-  },
   "embeddium-0.3.31+mc1.20.1.jar": {
     "jarName": "embeddium-0.3.31+mc1.20.1.jar",
     "modId": "embeddium",
@@ -964,6 +964,14 @@
     "curseForgeHash": 123853733,
     "modrinthHash": "3b9f1c7fea5e0bdbc6f06429e147bd0a7c08663d"
   },
+  "LongerChatHistory-1.3-Forge.jar": {
+    "jarName": "LongerChatHistory-1.3-Forge.jar",
+    "modId": "longerchathistory",
+    "name": "Longer Chat History",
+    "version": "1.3",
+    "curseForgeHash": 1497798873,
+    "modrinthHash": "717d1e68336519f97b7676322c98c9afe72651a0"
+  },
   "lootbeams-1.20.1-1.2.6.jar": {
     "jarName": "lootbeams-1.20.1-1.2.6.jar",
     "modId": "lootbeams",

config/ftbquests/quests/chapters/the_lab.snbt

@@ -90,9 +90,10 @@
 					type: "item"
 				}
 				{
+					consume_items: true
 					count: 2L
 					id: "3FF37C3D2694AF57"
-					item: { Count: 2, id: "numismatics:cog" }
+					item: "numismatics:cog"
 					type: "item"
 				}
 			]

config/ftbquests/quests/chapters/welcome_to_the_ranch.snbt

@@ -1015,6 +1015,7 @@
 				item: "farmersdelight:cake_slice"
 				type: "item"
 			}]
+			shape: "rsquare"
 			tasks: [
 				{
 					id: "1B51D0724E851D91"
@@ -1257,25 +1258,11 @@
 			}]
 			shape: "circle"
 			subtitle: "Eureka!"
-			tasks: [
-				{
-					id: "70D917DACD6BBCE0"
-					title: "Knowledge is power!"
-					type: "checkmark"
-				}
-				{
-					consume_items: true
-					count: 4L
-					id: "760AAEF7A16DEC88"
-					item: {
-						Count: 1
-						id: "splendid_slimes:slime_heart"
-						tag: { }
-					}
-					match_nbt: false
-					type: "item"
-				}
-			]
+			tasks: [{
+				id: "70D917DACD6BBCE0"
+				title: "Knowledge is power!"
+				type: "checkmark"
+			}]
 			title: "&b The Lab"
 			x: -6.25d
 			y: 5.5d

config/quark-common.toml

@@ -1614,7 +1614,7 @@
 		"Enchanting Tooltips" = true
 		"Fuel Time Tooltips" = true
 		"Shulker Box Use Colors" = true
-		"Shulker Box Require Shift" = true
+		"Shulker Box Require Shift" = false
 		"Map Require Shift" = true
 		#The value of each shank of food.
 		#Tweak this when using mods like Hardcore Hunger which change that value.

kubejs/assets/society_trading/lang/en_us.json

@@ -7,7 +7,7 @@
 	"shop.society_trading.mining_gadgets.description": "Upgrades for your (actually SCCOGAC's) trusty mining gadget.",
 	"shop.society_trading.travel_aids": "Travel Aids",
 	"shop.society_trading.travel_aids.description": "Gadgets and devices that help make the journey a little less perilous.",
-	"shop.society_trading.backpacks": "Backpacks",
+	"shop.society_trading.backpacks": "Backpacks & Storage",
 	"shop.society_trading.backpacks.description": "Backpacks and their upgrades for automation and convenience!",
 	"shop.society_trading.building_gadgets": "Building Gadgets",
 	"shop.society_trading.building_gadgets.description": "Ingenious gadgets crafted to assist builders in their building.",

kubejs/data/society_trading/shops/backpacks.json

@@ -5,6 +5,18 @@
 	"block_tag": "splendid_ranching:open_backpacks",
 	"jei_catalyst": { "item": "sophisticatedbackpacks:backpack" },
 	"trades": [
+		{
+			"offer": { "item": "minecraft:shulker_box", "count": 1 },
+			"request": { "item": "numismatics:cog", "count": 4 },
+			"numismatics_cost": 256,
+			"trade_id": "splendid_shulker_box"
+		},
+		{
+			"offer": { "item": "quark:crate", "count": 1 },
+			"request": { "item": "numismatics:sprocket", "count": 2 },
+			"numismatics_cost": 32,
+			"trade_id": "splendid_shulker_box"
+		},
 		{
 			"offer": { "item": "sophisticatedbackpacks:backpack", "count": 1 },
 			"request": { "item": "numismatics:crown", "count": 2 },

kubejs/data/society_trading/shops/banking.json

@@ -29,6 +29,12 @@
       "numismatics_cost": 32,
       "trade_id": "splendid_bank_market_monitor"
     },
+    {
+      "offer": { "item": "kubejs:market_data_storage", "count": 1 },
+      "request": { "item": "numismatics:crown", "count": 1 },
+      "numismatics_cost": 512,
+      "trade_id": "splendid_market_data_storage"
+    },
     {
       "offer": { "item": "numismatics:bank_terminal", "count": 1 },
       "request": { "item": "numismatics:cog", "count": 4 },

kubejs/data/society_trading/shops/mining_gadgets.json

@@ -11,20 +11,6 @@
         "numismatics_cost": 64,
         "trade_id": "splendid_mining_laser_mk1"
       },
-      {
-        "offer": { "item": "mininggadgets:mininggadget_fancy", "count": 1 },
-        "request": { "item": "numismatics:crown", "count": 1 },
-        "second_request": { "item": "mininggadgets:mininggadget_simple", "count": 1 },
-        "numismatics_cost": 512,
-        "trade_id": "splendid_mining_laser_mk2"
-      },
-      {
-        "offer": { "item": "mininggadgets:mininggadget", "count": 1 },
-        "request": { "item": "numismatics:sun", "count": 1 },
-        "second_request": { "item": "mininggadgets:mininggadget_fancy", "count": 1 },
-        "numismatics_cost": 4096,
-        "trade_id": "splendid_mining_laser_mk3"
-      },
       {
         "offer": { "item": "mininggadgets:modificationtable", "count": 1 },
         "request": { "item": "numismatics:cog", "count": 1 },

kubejs/server_scripts/mods/mininggadgets/shapeless.js

@@ -0,0 +1,25 @@
+ServerEvents.recipes(e => {
+    // All function the same, make them swappable
+
+    // mk1 > mk2
+    e.shapeless('mininggadgets:mininggadget_fancy', ['mininggadgets:mininggadget_simple'])
+        .modifyResult((grid, result) => {
+            let input = grid.find('mininggadgets:mininggadget_simple')
+            return result.withNBT(input.nbt)
+        })
+        .id(`kubejs:mininggadgets/shapeless/mk1_to_mk2`)
+    // mk2 > mk3
+    e.shapeless('mininggadgets:mininggadget', ['mininggadgets:mininggadget_fancy'])
+        .modifyResult((grid, result) => {
+            let input = grid.find('mininggadgets:mininggadget_fancy')
+            return result.withNBT(input.nbt)
+        })
+        .id(`kubejs:mininggadgets/shapeless/mk2_to_mk3`)
+    // mk3 > mk1
+    e.shapeless('mininggadgets:mininggadget_simple', ['mininggadgets:mininggadget'])
+        .modifyResult((grid, result) => {
+            let input = grid.find('mininggadgets:mininggadget')
+            return result.withNBT(input.nbt)
+        })
+        .id(`kubejs:mininggadgets/shapeless/mk3_to_mk1`)
+})

kubejs/startup_scripts/blocks/jadeBlocks.js

@@ -1,5 +1,3 @@
-
-
 /**
  * @param {Internal.BlockEntity} blockEntity
  * @param {Internal.CompoundTag} tag

kubejs/startup_scripts/blocks/marketDataStorage.js

@@ -0,0 +1,40 @@
+/** @param {Internal.BlockEntityJS} entity */
+global['handleDataStorageTick'] = (entity) => {
+    let nbt = entity.block.entityData
+    nbt.merge({ data: entity.level.server.persistentData['slime_value_data'] })
+}
+
+/** @param {Internal.BlockRightClickedEventJS} clickCtx */
+global['dataStorageClicked'] = (clickCtx) => {
+    const { block, player, item } = clickCtx
+    if (!player.shiftKeyDown) {
+        player.tell("§cShift key must be held to display market data")
+        return
+    }
+    let nbt = clickCtx.block.entityData
+    nbt.merge({ data: player.server.persistentData['slime_value_data'] })
+    player.tell(nbt)
+    player.tell("§dDisplayed market data above, copy from your log if usage desired.")
+}
+
+StartupEvents.registry("block", e => {
+    e.create("kubejs:market_data_storage", "cardinal")
+        .tagBlock("minecraft:mineable/pickaxe")
+        .tagBlock("minecraft:needs_stone_tool")
+        .soundType("copper")
+        .model("minecraft:block/furnace")
+        .item(item => {
+            item.tooltip(Text.gray("Stores the daily markets data in it's block entity data"))
+            item.tooltip(Text.gray("The data can be extracted using computercraft and a block reader"))
+            item.tooltip(Text.gray("Shift right clicking also sends you the full market data"))
+        })
+        .rightClick(clickCtx => {
+            if (clickCtx.hand == "OFF_HAND") return
+            global['dataStorageClicked'](clickCtx)
+        })
+        .blockEntity(blockInfo => {
+            blockInfo.serverTick(100, 0, entity => {
+                global['handleDataStorageTick'](entity)
+            })
+        })
+})

kubejs/startup_scripts/researchDefinitions.js

@@ -32,7 +32,7 @@
         "ingredients": ["create:super_glue"]
     },
     "create_harvest": {
         "name": "Harvesting \& Sawing",
         "ingredients": ["create:mechanical_saw", "create:mechanical_harvester"]
     },
     "create_process": {
@@ -40,7 +40,7 @@
         "ingredients": ["create:mechanical_mixer", "create:mechanical_press", "create:millstone"]
     },
     "create_interact": {
         "name": "Placing \& Breaking",
         "ingredients": ["create:mechanical_drill", "create:deployer"]
     },
     "create_cart": {
@@ -63,7 +63,7 @@
         "name": "Factory Gauges",
         "ingredients": ["create:factory_gauge", "#kubejs:extra_gauges"]
     },
-    "create_boiler": {
+    "create_boilers": {
         "name": "Steam Boilers",
         "ingredients": ["create:steam_engine"]
     },