Skip to content

Commit

Permalink
A few quest/script bugfixes
Browse files Browse the repository at this point in the history
GT Tools quests now ignore NBT
  • Loading branch information
mcadventurecity committed Sep 30, 2023
1 parent fa4a86a commit 24761ec
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 15 deletions.
2 changes: 1 addition & 1 deletion config/InvTweaks.cfg
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Inventory Tweaks Configuration
#(Regarding shortcuts, all key names can be found at: http://legacy.lwjgl.org/javadoc/org/lwjgl/input/Keyboard.html)
#Fri Sep 29 16:48:34 EDT 2023
#Sat Sep 30 12:56:53 EDT 2023
enableMiddleClick=true
showChestButtons=true
enableSortingOnPickup=false
Expand Down
2 changes: 1 addition & 1 deletion config/astralsorcery/amulet_enchantments.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
##########################################################################################################

data {
# [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [extrautils2:xu.kaboomerang:10], [extrautils2:xu.zoomerang:10], [extrautils2:xu.burnerang:10], [extrautils2:xu.bladerang:10], [extrautils2:xu.boomereaperang:10], [openblocks:explosive:2], [openblocks:last_stand:5], [openblocks:flim_flam:2], [advancedrocketry:spacebreathing:10], [endercore:xpboost:5], [endercore:autosmelt:2], [tombstone:shadow_step:2], [tombstone:soulbound:2], [tombstone:magic_siphon:2], [tombstone:plague_bringer:2], [tombstone:blessing:2], [tombstone:curse_of_bones:2], [enderio:witherweapon:5], [enderio:repellent:1], [enderio:soulbound:1], [enderio:witherarrow:5], [bewitchment:magic_protection:1], [gregtech:disjunction:5], [gregtech:hard_hammer:5], [abyssalcraft:coralium:2], [abyssalcraft:dread:2], [abyssalcraft:light_pierce:10], [abyssalcraft:iron_wall:5], [abyssalcraft:sapping:5], [abyssalcraft:multi_rend:2], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1]]
# [default: [minecraft:protection:10], [minecraft:fire_protection:5], [minecraft:feather_falling:5], [minecraft:blast_protection:2], [minecraft:projectile_protection:5], [minecraft:respiration:2], [minecraft:aqua_affinity:2], [minecraft:thorns:1], [minecraft:depth_strider:2], [minecraft:frost_walker:2], [minecraft:sharpness:10], [minecraft:smite:5], [minecraft:bane_of_arthropods:5], [minecraft:knockback:5], [minecraft:fire_aspect:2], [minecraft:looting:2], [minecraft:sweeping:2], [minecraft:efficiency:10], [minecraft:silk_touch:1], [minecraft:unbreaking:5], [minecraft:fortune:2], [minecraft:power:10], [minecraft:punch:2], [minecraft:flame:2], [minecraft:infinity:1], [minecraft:luck_of_the_sea:2], [minecraft:lure:2], [minecraft:mending:2], [extrautils2:xu.kaboomerang:10], [extrautils2:xu.zoomerang:10], [extrautils2:xu.burnerang:10], [extrautils2:xu.bladerang:10], [extrautils2:xu.boomereaperang:10], [openblocks:explosive:2], [openblocks:last_stand:5], [openblocks:flim_flam:2], [advancedrocketry:spacebreathing:10], [endercore:xpboost:5], [endercore:autosmelt:2], [tombstone:shadow_step:2], [tombstone:soulbound:2], [tombstone:magic_siphon:2], [tombstone:plague_bringer:2], [tombstone:blessing:2], [tombstone:curse_of_bones:2], [enderio:witherarrow:5], [enderio:repellent:1], [enderio:witherweapon:5], [enderio:soulbound:1], [bewitchment:magic_protection:1], [gregtech:disjunction:5], [gregtech:hard_hammer:5], [abyssalcraft:coralium:2], [abyssalcraft:dread:2], [abyssalcraft:light_pierce:10], [abyssalcraft:iron_wall:5], [abyssalcraft:sapping:5], [abyssalcraft:multi_rend:2], [cofhcore:holding:5], [cofhcore:insight:5], [cofhcore:leech:5], [cofhcore:multishot:5], [cofhcore:smashing:2], [cofhcore:smelting:2], [cofhcore:soulbound:5], [cofhcore:vorpal:2], [astralsorcery:enchantment.as.nightvision:1], [astralsorcery:enchantment.as.smelting:1]]
S:data <
minecraft:protection:10
minecraft:fire_protection:5
Expand Down
8 changes: 4 additions & 4 deletions config/betterquesting/DefaultQuests.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"properties:10": {
"betterquesting:10": {
"autoclaim:1": 0,
"desc:8": "Exploring the world, you may notice some things. Most significantly, you cannot punch trees to collect wood! This is caused by the mod PyroTech, which significantly overhauls Stone Age progression. To proceed, you will need to collect a few things.\n\n§7Rocks§r: Can be found on the ground in most areas and collected by breaking.\n\n§2§2§a§2Sticks§r: Can be obtained by breaking leaves on trees.\n\n§aPlant Fibers§r: Can be obtained by breaking tall grass.",
"desc:8": "Exploring the world, you may notice some things. Most significantly, you cannot punch trees to collect wood! This is caused by the mod PyroTech, which significantly overhauls Stone Age progression. To proceed, you will need to collect a few things.\n\n§7Rocks§r: Can be found on the ground in most areas and collected by breaking.\n\n§2§2§a§2Sticks§r: Can be obtained by breaking leaves on trees.\n\n§aPlant Fibers§r: Can be obtained by breaking grass.",
"globalshare:1": 0,
"icon:10": {
"Count:3": 1,
Expand Down Expand Up @@ -1224,7 +1224,7 @@
"autoConsume:1": 0,
"consume:1": 0,
"groupDetect:1": 0,
"ignoreNBT:1": 0,
"ignoreNBT:1": 1,
"index:3": 0,
"partialMatch:1": 1,
"requiredItems:9": {
Expand Down Expand Up @@ -1378,7 +1378,7 @@
"autoConsume:1": 0,
"consume:1": 0,
"groupDetect:1": 0,
"ignoreNBT:1": 0,
"ignoreNBT:1": 1,
"index:3": 0,
"partialMatch:1": 1,
"requiredItems:9": {
Expand Down Expand Up @@ -13924,7 +13924,7 @@
},
"questSettings:10": {
"betterquesting:10": {
"editmode:1": 1,
"editmode:1": 0,
"hardcore:1": 0,
"home_anchor_x:5": 0.5,
"home_anchor_y:5": 0.0,
Expand Down
1 change: 1 addition & 0 deletions config/jei/worldSettings.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ world-1780728105 {


world-78688046 {
# Show the list of bookmarks next to open GUIs.
B:bookmarkOverlayEnabled=true

# Give items instead of showing the recipe.
Expand Down
4 changes: 2 additions & 2 deletions config/splash.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Splash screen properties
#Fri Sep 29 16:46:50 EDT 2023
#Sat Sep 30 12:55:11 EDT 2023
logoOffset=0
barBackground=0xFFFFFF
memoryGood=0x78CB34
Expand All @@ -16,5 +16,5 @@ background=0xFFFFFF
bar=0xCB3D35
resourcePackPath=resources
barBorder=0xC0C0C0
fontTexture=textures/font/ascii.png
=\=\=\=\=\=\=
fontTexture=textures/font/ascii.png
14 changes: 7 additions & 7 deletions scripts/avaritia.zs
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ var fusionReactor = mods.gregtech.recipe.RecipeMap.getByName("fusion_reactor");
// Infinity

mods.avaritia.ExtremeCrafting.remove(<avaritia:resource:6>);
fusionReactor.recipeBuilder()
.fluidInputs([<liquid:alloyium> * 20, <liquid:periodicium>*20])
.fluidOutputs(<liquid:infinity> * 50)
.duration(50)
.EUt(130720)
.property("eu_to_start", 150000000)
.buildAndRegister();
// fusionReactor.recipeBuilder()
// .fluidInputs([<liquid:alloyium> * 20, <liquid:periodicium>*20])
// .fluidOutputs(<liquid:infinity> * 50)
// .duration(50)
// .EUt(130720)
// .property("eu_to_start", 150000000)
// .buildAndRegister();

0 comments on commit 24761ec

Please sign in to comment.