Skip to content

Commit

Permalink
Early game changes
Browse files Browse the repository at this point in the history
  • Loading branch information
Electrolyte220 committed Jul 12, 2024
1 parent e5875a3 commit aaba973
Show file tree
Hide file tree
Showing 27 changed files with 84 additions and 229 deletions.
19 changes: 7 additions & 12 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
**Script/Config Changes**
- Disable terralith alt recipes
- Add missing recipes for various wood-related things in the cutter & assembler
- Downgrade EMI to fix categories being improperly hidden
- Change various centrifuging/electrolyzing recipes to output wrought iron dust instead of regular iron dust
- Change recipe and add quest for create super glue
- Add create stones to rock breaker
- Mark certain mods as client-side only
- Disable early game wire coating recipes in assembler
- Fix some quests
- Generate Blooms in GBTHCore instead of Kube
- Change cable recipes in Greate instead of Kube
- Update ULS machine recipes
- Remove create andesite alloy in place of gt andesite alloy

**Mod Changes**
- Terralith_1.20_v2.5.1 -> Terralith_1.20.x_v2.5.4
- jmi-forge-1.20.1-0.14-47 -> jmi-forge-1.20.1-0.14-48
- modernfix-forge-5.18.1+mc1.20.1 -> modernfix-forge-5.18.6+mc1.20.1
- appliedenergistics2-forge-15.2.8 -> appliedenergistics2-forge-15.2.9
- embeddium-0.3.24+mc1.20.1 -> embeddium-0.3.25+mc1.20.1
- greate-0.0.23 -> greate-0.0.24
4 changes: 2 additions & 2 deletions config/heracles/quests/introduction/andesite_alloy.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"tasks": {
"andesite_alloy": {
"type": "heracles:item",
"item": "create:andesite_alloy",
"item": "gtceu:andesite_alloy_ingot",
"amount": 2,
"collection": "AUTOMATIC"
}
Expand Down Expand Up @@ -42,7 +42,7 @@
},
"icon": {
"item": {
"id": "create:andesite_alloy",
"id": "gtceu:andesite_alloy_ingot",
"count": 1
},
"type": "heracles:item"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"groups": {
"LV/LS - The Grind Starts Here": {
"position": [
22,
21,
37
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"groups": {
"LV/LS - The Grind Starts Here": {
"position": [
22,
21,
9
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"groups": {
"LV/LS - The Grind Starts Here": {
"position": [
58,
21,
-21
]
}
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"groups": {
"LV/LS - The Grind Starts Here": {
"position": [
30,
-8,
-21
]
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
},
"0BCE402AC980D544": {
"type": "heracles:item",
"item": "create:andesite_alloy",
"item": "gtceu:andesite_alloy_ingot",
"amount": 8,
"collection": "AUTOMATIC"
}
Expand Down
12 changes: 6 additions & 6 deletions index.toml
Original file line number Diff line number Diff line change
Expand Up @@ -207,9 +207,6 @@ file = "config/heracles/quests/lvlsthegrindstartshere/extracting_and_solidifying
[[files]]
file = "config/heracles/quests/lvlsthegrindstartshere/filtering_the_outputs.json"

[[files]]
file = "config/heracles/quests/lvlsthegrindstartshere/generating_more_steam.json"

[[files]]
file = "config/heracles/quests/lvlsthegrindstartshere/getting_oxygen.json"

Expand Down Expand Up @@ -1239,9 +1236,6 @@ file = "kubejs/server_scripts/Mods/Greg/Centrifuge.js"
[[files]]
file = "kubejs/server_scripts/Mods/Greg/CokeOven.js"

[[files]]
file = "kubejs/server_scripts/Mods/Greg/Create.js"

[[files]]
file = "kubejs/server_scripts/Mods/Greg/Cutter.js"

Expand Down Expand Up @@ -1362,6 +1356,12 @@ file = "kubejs/startup_scripts/Ores.js"
[[files]]
file = "kubejs/startup_scripts/Util.js"

[[files]]
file = "mods/Mantle-1.20.1-1.10-UNOFFICIAL.DEV.db940e7.jar.disabled"

[[files]]
file = "mods/TinkersConstruct-1.20.1-3.8.3-UNOFFICIAL.DEV.ed337cc6d.jar.disabled"

[[files]]
file = "mods/ad-astra.pw.toml"
metafile = true
Expand Down
3 changes: 2 additions & 1 deletion kubejs/server_scripts/ItemRemoval.js
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ var recipesToReplace = [
{removedItem: "gtceu:iv_bender", replacement: 'greate:tungsten_steel_mechanical_press'},
{removedItem: "gtceu:iv_mixer", replacement: 'greate:tungsten_steel_mechanical_mixer'},
{removedItem: "gtceu:iv_cutter", replacement: 'greate:tungsten_steel_mechanical_saw'},
{removedItem: "ae2:ender_dust", replacement: 'gtceu:ender_pearl_dust'}
{removedItem: "ae2:ender_dust", replacement: 'gtceu:ender_pearl_dust'},
{removedItem: "create:andesite_alloy", replacement: 'gtceu:andesite_alloy_ingot'}
]

ServerEvents.tags('item', event => {
Expand Down
2 changes: 1 addition & 1 deletion kubejs/server_scripts/Loot.js
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ ServerEvents.chestLootTables(event => {
p.addItem('gtceu:wrought_iron_ingot', 3, [1, 8])
p.addItem('minecraft:iron_ingot', 2, [1, 4])
p.addItem('gtceu:rubber_ingot', 3, [1, 8])
p.addItem('create:andesite_alloy', 2, [1, 4])
p.addItem('gtceu:andesite_alloy_ingot', 2, [1, 4])
p.addItem('create:andesite_casing', 2, [1, 2])
p.addItem('greate:andesite_alloy_shaft', 2, [1, 4])
p.addItem('greate:andesite_alloy_cogwheel', 2, [1, 4])
Expand Down
2 changes: 1 addition & 1 deletion kubejs/server_scripts/Mods/ConstructionWand.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ServerEvents.recipes(event => {
],
{
A:'minecraft:stick',
B:'create:andesite_alloy'
B:'gtceu:andesite_alloy_ingot'
}
)

Expand Down
26 changes: 3 additions & 23 deletions kubejs/server_scripts/Mods/Create.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ ServerEvents.recipes(event => {
event.remove({id: 'create:crafting/kinetics/fluid_pipe_vertical'})
event.remove({id: 'create:crafting/kinetics/goggles'})
event.remove({id: 'create:shaped/andesite_alloy' })
event.remove({id: 'create/splashing/magma_block'})
event.remove({id: 'create:crafting/kinetics/super_glue'})

event.replaceInput({id: 'create:shaped/wrench'}, 'gtceu:gold_plate', 'gtceu:wrought_iron_plate')
event.replaceInput({id: 'create:crafting/kinetics/goggles'}, 'gtceu:gold_plate', 'gtceu:wrought_iron_plate')
Expand Down Expand Up @@ -188,28 +190,6 @@ ServerEvents.recipes(event => {
}
)

event.shaped(Item.of('create:andesite_alloy'),
[
'AN',
'NA'
],
{
A: 'minecraft:andesite',
N: 'gtceu:wrought_iron_plate'
}
)

event.shaped(Item.of('create:andesite_alloy'),
[
'NA',
'AN'
],
{
A: 'minecraft:andesite',
N: 'gtceu:wrought_iron_plate'
}
)

event.shaped(Item.of('create:cart_assembler'),
[
'SRS',
Expand All @@ -230,7 +210,7 @@ ServerEvents.recipes(event => {
' C '
],
{
A: 'create:andesite_alloy',
A: 'gtceu:andesite_alloy_ingot',
S: 'gtceu:steel_plate',
C: 'create:andesite_casing',
}
Expand Down
10 changes: 2 additions & 8 deletions kubejs/server_scripts/Mods/Greg/AlloySmelter.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
ServerEvents.recipes(event => {

event.remove({id: 'gtceu:alloy_smelter/glass'})

global.Greate.MachineTiers.forEach(tier => {
var output = `kubejs:${tier}_sand_paper`
var input = `gtceu:${tier}_plate`
Expand All @@ -9,15 +11,7 @@ ServerEvents.recipes(event => {
.itemOutputs(output)
.EUt(32)
})

event.recipes.gtceu.alloy_smelter('andesite_alloy_ingot')
.duration(200)
.itemInputs('create:andesite_alloy')
.notConsumable('gtceu:ingot_casting_mold')
.itemOutputs('gtceu:andesite_alloy_ingot')
.EUt(7)

event.remove({id: 'gtceu:alloy_smelter/glass'})
event.recipes.gtceu.alloy_smelter('glass')
.duration(240)
.itemInputs('gtceu:glass_dust')
Expand Down
29 changes: 16 additions & 13 deletions kubejs/server_scripts/Mods/Greg/Bloomery.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
ServerEvents.recipes(event => {

// Blooms
bloomeryRecipe('kubejs:copper_bloom', 600, 'kubejs:copper_bloom', ['#gbth:copper_bloom_inputs', '#minecraft:coals'])
bloomeryRecipe('kubejs:tin_bloom', 600, 'kubejs:tin_bloom', ['#gbth:tin_bloom_inputs', '#minecraft:coals'])
bloomeryRecipe('kubejs:wrought_iron_bloom', 600, 'kubejs:wrought_iron_bloom', ['#gbth:wrought_iron_bloom_inputs', '#minecraft:coals'])
bloomeryRecipe('kubejs:bronze_bloom', 900, '4x kubejs:bronze_bloom', ['3x minecraft:copper_ingot', 'gtceu:tin_ingot', '2x #minecraft:coals'])
bloomeryRecipe('gtceu:copper_bloom', 600, 'gtceu:copper_bloom', ['#gbth:copper_bloom_inputs', '#minecraft:coals'])
bloomeryRecipe('gtceu:tin_bloom', 600, 'gtceu:tin_bloom', ['#gbth:tin_bloom_inputs', '#minecraft:coals'])
bloomeryRecipe('gtceu:wrought_iron_bloom', 600, 'gtceu:wrought_iron_bloom', ['#gbth:wrought_iron_bloom_inputs', '#minecraft:coals'])
bloomeryRecipe('gtceu:bronze_bloom', 900, '4x gtceu:bronze_bloom', ['3x minecraft:copper_ingot', 'gtceu:tin_ingot', '2x #minecraft:coals'])
bloomeryRecipe('gtceu:andesite_alloy_bloom', 900, 'gtceu:andesite_alloy_bloom', ['2x gtceu:wrought_iron_ingot', 'minecraft:andesite', '2x #minecraft:coals'])

// Other bloomery recipes
bloomeryRecipe('kubejs:stone', 300, 'minecraft:stone', ['minecraft:cobblestone', '#minecraft:coals'])
Expand All @@ -17,14 +18,16 @@ ServerEvents.recipes(event => {
.itemOutputs(output)
}

metalworkingRecipe('minecraft:copper_ingot', 'kubejs:copper_bloom', 'gtceu:brick_wooden_form')
metalworkingRecipe('9x gtceu:copper_nugget', 'kubejs:copper_bloom', 'kubejs:nugget_wooden_form')
metalworkingRecipe('gtceu:tin_ingot', 'kubejs:tin_bloom', 'gtceu:brick_wooden_form')
metalworkingRecipe('9x gtceu:tin_nugget', 'kubejs:tin_bloom', 'kubejs:nugget_wooden_form')
metalworkingRecipe('gtceu:bronze_ingot', 'kubejs:bronze_bloom', 'gtceu:brick_wooden_form')
metalworkingRecipe('9x gtceu:bronze_nugget', 'kubejs:bronze_bloom', 'kubejs:nugget_wooden_form')
metalworkingRecipe('gtceu:wrought_iron_ingot', 'kubejs:wrought_iron_bloom', 'gtceu:brick_wooden_form')
metalworkingRecipe('9x gtceu:wrought_iron_nugget', 'kubejs:wrought_iron_bloom', 'kubejs:nugget_wooden_form')
metalworkingRecipe('minecraft:copper_ingot', 'gtceu:copper_bloom', 'gtceu:brick_wooden_form')
metalworkingRecipe('9x gtceu:copper_nugget', 'gtceu:copper_bloom', 'kubejs:nugget_wooden_form')
metalworkingRecipe('gtceu:tin_ingot', 'gtceu:tin_bloom', 'gtceu:brick_wooden_form')
metalworkingRecipe('9x gtceu:tin_nugget', 'gtceu:tin_bloom', 'kubejs:nugget_wooden_form')
metalworkingRecipe('gtceu:bronze_ingot', 'gtceu:bronze_bloom', 'gtceu:brick_wooden_form')
metalworkingRecipe('9x gtceu:bronze_nugget', 'gtceu:bronze_bloom', 'kubejs:nugget_wooden_form')
metalworkingRecipe('gtceu:wrought_iron_ingot', 'gtceu:wrought_iron_bloom', 'gtceu:brick_wooden_form')
metalworkingRecipe('9x gtceu:wrought_iron_nugget', 'gtceu:wrought_iron_bloom', 'kubejs:nugget_wooden_form')
metalworkingRecipe('gtceu:andesite_alloy_ingot', 'gtceu:andesite_alloy_bloom', 'gtceu:brick_wooden_form')
metalworkingRecipe('9x gtceu:andesite_alloy_nugget', 'gtceu:andesite_alloy_bloom', 'kubejs:nugget_wooden_form')

function metalworkingRecipe(output, input, form) {
event.shapeless(
Expand All @@ -36,4 +39,4 @@ ServerEvents.recipes(event => {
]
).keepIngredient(form).damageIngredient('kubejs:stone_hammer')
}
})
})
17 changes: 0 additions & 17 deletions kubejs/server_scripts/Mods/Greg/Create.js

This file was deleted.

2 changes: 1 addition & 1 deletion kubejs/server_scripts/Mods/Minecraft.js
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ ServerEvents.recipes(event => {
'LL'
],
{
A: 'create:andesite_alloy',
A: 'gtceu:andesite_alloy_ingot',
L: '#minecraft:logs'
}
)
Expand Down
Loading

0 comments on commit aaba973

Please sign in to comment.