New storagedrawers update, adds a cool keyring, also I finally fixed the names of the drawers from all of our mods. UPDATE REQUIRED.
All checks were successful
continuous-integration/drone/push Build is passing

This commit is contained in:
Steve McMaster 2024-08-22 02:59:33 +00:00
parent fbe11dccaf
commit 24a545b7f7
8 changed files with 68 additions and 14 deletions

View File

@ -3018,7 +3018,7 @@ hash = "52de0886206bb57e8a20cb0eb82bbb5afa913d3a5a19e2b283780f4a5e5b7c91"
[[files]]
file = "kubejs/client_scripts/storagedrawers.js"
hash = "d3be481056a0d9336b073df8bff0ccd3ff5ed60a631d49006ae568b916158aa1"
hash = "405cf7d16d10d3438caf2e066f86289f23d8c8fd52d47e8e2076487885de6edf"
[[files]]
file = "kubejs/config/client.properties"
@ -3038,7 +3038,7 @@ hash = "efe2c9b1836ddf6627b94b126d8e21fa460d874d46d80db10407169d10928cce"
[[files]]
file = "kubejs/data/create/tags/fluids/bottomless/allow.json"
hash = "4289a724f673cd1199ec2a6ad2cb3718ff15afff6c15914280baf462e9e77aa9"
hash = "644e46512802355a049f44b97b573b1a1b09cd62f0a767a819c3bd44aca77037"
[[files]]
file = "kubejs/data/create/tags/items/vanilla_stripped_logs.json"
@ -3636,6 +3636,10 @@ hash = "267e4aa585949f9fb137d63f7ee4857bda8717eb117ff7cd0fe60b89158ec0ea"
file = "kubejs/data/create_dd/tags/items/spirit_woodset.json"
hash = "c4072bc828917801ab329bf1fb8325250697102c30813b1b5138fc091ab5e90d"
[[files]]
file = "kubejs/data/create_enchantment_industry/recipes/compat/sophisticatedcore/mixing/experience_conversion.json"
hash = "71fa05c0e4115f78c9b3e3a524b9df88552be9bbf94fe26093e4a0d30896cc40"
[[files]]
file = "kubejs/data/create_sa/tags/fluids/jetpack_fuel.json"
hash = "c9ae2d82c3599230d1b1d039d884be1b99a3c3d9dfacd68447acc2c66afa7c5d"
@ -3854,7 +3858,7 @@ hash = "f960b4b2ff57f6250da0c1fcab80cdc3594898569dfc068e3be5bfe0e04e5ecf"
[[files]]
file = "kubejs/startup_scripts/_common.js"
hash = "9c7078e3b803559ece2f9dcbf1b3248b8645c36f5b863de736315db496eff9ff"
hash = "ee89827d6c3646c880bd44e7ba86d0b8e5a7a7df0a7de116b8f92aad1638c251"
[[files]]
file = "kubejs/startup_scripts/apocalypsenow.js"
@ -3898,7 +3902,7 @@ hash = "ec3342cf7571c09713c1b0360e21d23452730728621967a41c36366362961c38"
[[files]]
file = "kubejs/startup_scripts/storagedrawers.js"
hash = "4ef69aa1417a8a7695dd3a3d507c30a1df41c8e904e371c0cce7dcc222afa683"
hash = "08d6d378be2a6e67036e0415b1a2ce9af899a48ffc9841b06be3e6f6378ac2b6"
[[files]]
file = "kubejs/startup_scripts/wither.js"
@ -5060,7 +5064,7 @@ metafile = true
[[files]]
file = "mods/storage-drawers.pw.toml"
hash = "b23614f126b6ad58ccc18d45c547d2e7357da867ff1a45f63e3dcb246f3a87f4"
hash = "696df5ffb8ae9eccbb04b024646cc9557ddef11265d28f4d5f9f1caf74f10171"
metafile = true
[[files]]

View File

@ -28,6 +28,7 @@ if (Platform.isLoaded('storagedrawers')) {
let drawer_id = drawerType['name'] + '_' + (halfDepth ? 'half' : 'full') + '_drawers_' + drawerCount
event.add(
'storagedrawers',
'block.storagedrawers.' + drawer_id,
pretty_name + (halfDepth ? ' Half' : '') + ' Drawers ' + countLabel
)

View File

@ -3,6 +3,11 @@
"values": [
"createaddition:bioethanol",
"kubejs:molten_coal",
"sliceanddice:fertilizer"
"sliceanddice:fertilizer",
"mekanism:hydrogen",
"mekanism:oxygen",
"mekanism:brine",
"mekanism:heavy_water",
"mekanismgenerators:bioethanol"
]
}

View File

@ -0,0 +1,27 @@
{
"conditions": [
{
"type": "forge:mod_loaded",
"modid": "sophisticatedcore"
}
],
"type": "create:mixing",
"ingredients": [
{
"item": "create_enchantment_industry:experience_rotor"
},
{
"fluid": "create_enchantment_industry:experience",
"amount": 10
}
],
"results": [
{
"item": "create_enchantment_industry:experience_rotor"
},
{
"fluid": "sophisticatedcore:xp_still",
"amount": 200
}
]
}

View File

@ -30,6 +30,18 @@ const $Moonlight = {
'WoodType': Java.loadClass('net.mehvahdjukaar.moonlight.api.set.wood.WoodType')
}
/**
* Semantic Versioning Comparing
* #see https://semver.org/
* #see https://stackoverflow.com/a/65687141/456536
* #see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/Collator/Collator#options
*/
global.semverCompare = (a, b) => {
if (a.startsWith(b + "-")) return -1
if (b.startsWith(a + "-")) return 1
return a.localeCompare(b, undefined, { numeric: true, sensitivity: "case", caseFirst: "upper" })
}
global.woodTypes = [
{ 'id': 'acacia', 'name': 'Acacia', 'mod': 'minecraft', 'planks': { 'id': 'acacia_planks' } },
{ 'id': 'birch', 'name': 'Birch', 'mod': 'minecraft', 'planks': { 'id': 'birch_planks' } },

View File

@ -2,10 +2,6 @@ global.storageDrawers = {
'blocks': [],
'items': [],
'drawerTypes': [
{ 'name': 'bamboo', 'planks': 'minecraft:bamboo_planks' },
{ 'name': 'cherry', 'planks': 'minecraft:cherry_planks' },
{ 'name': 'mangrove', 'planks': 'minecraft:mangrove_planks' },
{ 'name': 'rose', 'planks': 'create_dd:rose_planks' },
{ 'name': 'rubber', 'planks': 'create_dd:rubber_planks' },
{ 'name': 'smoked', 'planks': 'create_dd:smoked_planks' },
@ -13,6 +9,15 @@ global.storageDrawers = {
]
}
if (global.semverCompare(Platform.getInfo('storagedrawers').getVersion(), '12.4.0') < 0) {
// Workaround until we update, and then handle it automatically
[
{ 'name': 'bamboo', 'planks': 'minecraft:bamboo_planks' },
{ 'name': 'cherry', 'planks': 'minecraft:cherry_planks' },
{ 'name': 'mangrove', 'planks': 'minecraft:mangrove_planks' }
].forEach((drawerType) => global.storageDrawers.drawerTypes.push(drawerType))
}
if (Platform.isLoaded('biomesoplenty')) {
[
{ 'name': 'dead', 'planks': 'biomesoplenty:dead_planks' },

View File

@ -1,13 +1,13 @@
name = "Storage Drawers"
filename = "StorageDrawers-1.20.1-12.0.4.jar"
filename = "StorageDrawers-1.20.1-12.5.2.jar"
side = "both"
[download]
hash-format = "sha1"
hash = "a2f2c402f7f234e6c93c0a7ed75a2da83b819305"
hash = "10195867b5f120c474816945aa4efbead9ac5cbd"
mode = "metadata:curseforge"
[update]
[update.curseforge]
file-id = 5588623
file-id = 5648796
project-id = 223852

View File

@ -6,7 +6,7 @@ pack-format = "packwiz:1.1.0"
[index]
file = "index.toml"
hash-format = "sha256"
hash = "26b5e3746f607a1287239a408bb6a6882dc68357c9b5b25cdbe2bb0e65addcd1"
hash = "f42404eb079ffcf546cdcaafcf9c4587dc31e4a913c78e04db6dc09c926b784e"
[versions]
forge = "47.3.5"