Skip to content

Commit

Permalink
Merge pull request #436 from MuteTiefling/more-feedback
Browse files Browse the repository at this point in the history
E9E Feedback
  • Loading branch information
MuteTiefling authored Jun 21, 2023
2 parents 326b3a3 + ce3f686 commit f5f1757
Show file tree
Hide file tree
Showing 18 changed files with 347 additions and 15 deletions.
1 change: 1 addition & 0 deletions changelogs/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

- Fix Powah Reactor recipe [\#409](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/409) ([MuteTiefling](https://github.com/MuteTiefling))
- Fix Cows, Sheep, and Pigs not dropping Animal Fat [\#432](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/432) ([MuteTiefling](https://github.com/MuteTiefling))
- Disable Quark Troughs in favor of Farming for Blockheads due to TPS issues. [\#436](https://github.com/EnigmaticaModpacks/Enigmatica9/pull/436) ([MuteTiefling](https://github.com/MuteTiefling))

---

Expand Down
70 changes: 70 additions & 0 deletions config/configswapper/expert/config/ars_nouveau-common.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@

#General settings
[general]
#Dimensions where hostile mobs will not spawn. Ex: ["minecraft:overworld", "undergarden:undergarden"]. . Run /forge dimensions for a list.
dimensionBlacklist = []
#Spawn a book in the players inventory on login
spawnBook = false
#How much mana whirlisprigs consume per generation
#Range: 0 ~ 10000
sylphManaCost = 250
#How much progress whirlisprigs must accumulate before creating resources
#Range: 0 ~ 10000
whirlisprigProgress = 250
#Should the Wilden Hunter attack animals?
hunterHuntsAnimals = true
#Should the Wilden Stalker attack animals?
stalkerHuntsAnimals = false
#Should the Wilden Defender attack animals?
defenderHuntsAnimals = false
#Archwood forest spawn weight
#Range: > 0
archwoodForest = 2
#Inform the player of Dynamic lights once.
informLights = true
#Should the Wilden Chimera dive bomb destroy blocks?
destructiveDiveBomb = false
#How many inventories can lectern support per bookwyrm
#Range: > 1
bookwyrmLimit = 8

[drygmy_production]
#How much source drygmys consume per generation
#Range: 0 ~ 10000
drygmyManaCost = 1000
#How many channels must occur before a drygmy produces loot
#Range: 0 ~ 300
drygmyMaxProgress = 20
#Bonus number of items a drygmy produces per unique mob
#Range: 0 ~ 300
drygmyUniqueBonus = 2
#Base number of items a drygmy produces per cycle before bonuses.
#Range: > -2147483648
drygmyBaseItems = 1
#Max Bonus number of items a drygmy produces from nearby entities. Each entity equals 1 item.
#Range: 0 ~ 300
drygmyQuantityCap = 5

#Items
[item]
#Spawn Caster Tomes in Dungeon Loot?
spawnTomes = true

#Debug
[debug]
#Max number of log events to keep on entities. Lowering this number may make it difficult to debug why your entities are stuck.
#Range: > 0
maxLogEvents = 100

#Blocks
[block]
#How much potion a melder takes from each input jar. 100 = 1 potion
#Range: > 100
melderInputCost = 100
#How much potion a melder outputs per cycle. 100 = 1 potion
#Range: > 100
melderOutput = 200
#How much source a melder takes per cycle
#Range: > 0
melderSourceCost = 100

2 changes: 1 addition & 1 deletion config/configswapper/expert/config/quark-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
"Metal Buttons" = true
Gravisand = true
"Pistons Move Tile Entities" = false
"Feeding Trough" = true
"Feeding Trough" = false
"Redstone Randomizer" = true

[automation.dispensers_place_blocks]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@
hose_pulley = 4.0
mechanical_crafter = 2.0

shaft = 0.05
shaft = 0.1
andesite_encased_shaft = 0.0
brass_encased_shaft = 0.0

Expand Down
4 changes: 2 additions & 2 deletions config/configswapper/expert/serverconfig/xnet-server.toml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@
maxPublishedChannels = 32
#Power usage for the controller regardless of what it is doing
#Range: 0 ~ 1000000000
controllerRFPerTick = 128
controllerRFPerTick = 32
#Power usage for the controller per active channel
#Range: 0 ~ 1000000000
controllerChannelRFT = 32
controllerChannelRFT = 16
#Power usage for the controller per operation performed by one of the channels
#Range: 0 ~ 1000000000
controllerOperationRFT = 64
Expand Down
70 changes: 70 additions & 0 deletions config/configswapper/normal/config/ars_nouveau-common.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@

#General settings
[general]
#Dimensions where hostile mobs will not spawn. Ex: ["minecraft:overworld", "undergarden:undergarden"]. . Run /forge dimensions for a list.
dimensionBlacklist = []
#Spawn a book in the players inventory on login
spawnBook = false
#How much mana whirlisprigs consume per generation
#Range: 0 ~ 10000
sylphManaCost = 250
#How much progress whirlisprigs must accumulate before creating resources
#Range: 0 ~ 10000
whirlisprigProgress = 250
#Should the Wilden Hunter attack animals?
hunterHuntsAnimals = true
#Should the Wilden Stalker attack animals?
stalkerHuntsAnimals = false
#Should the Wilden Defender attack animals?
defenderHuntsAnimals = false
#Archwood forest spawn weight
#Range: > 0
archwoodForest = 2
#Inform the player of Dynamic lights once.
informLights = true
#Should the Wilden Chimera dive bomb destroy blocks?
destructiveDiveBomb = true
#How many inventories can lectern support per bookwyrm
#Range: > 1
bookwyrmLimit = 8

[drygmy_production]
#How much source drygmys consume per generation
#Range: 0 ~ 10000
drygmyManaCost = 1000
#How many channels must occur before a drygmy produces loot
#Range: 0 ~ 300
drygmyMaxProgress = 20
#Bonus number of items a drygmy produces per unique mob
#Range: 0 ~ 300
drygmyUniqueBonus = 2
#Base number of items a drygmy produces per cycle before bonuses.
#Range: > -2147483648
drygmyBaseItems = 1
#Max Bonus number of items a drygmy produces from nearby entities. Each entity equals 1 item.
#Range: 0 ~ 300
drygmyQuantityCap = 5

#Items
[item]
#Spawn Caster Tomes in Dungeon Loot?
spawnTomes = true

#Debug
[debug]
#Max number of log events to keep on entities. Lowering this number may make it difficult to debug why your entities are stuck.
#Range: > 0
maxLogEvents = 100

#Blocks
[block]
#How much potion a melder takes from each input jar. 100 = 1 potion
#Range: > 100
melderInputCost = 200
#How much potion a melder outputs per cycle. 100 = 1 potion
#Range: > 100
melderOutput = 100
#How much source a melder takes per cycle
#Range: > 0
melderSourceCost = 300

2 changes: 1 addition & 1 deletion config/configswapper/normal/config/quark-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@
"Metal Buttons" = true
Gravisand = true
"Pistons Move Tile Entities" = false
"Feeding Trough" = true
"Feeding Trough" = false
"Redstone Randomizer" = true

[automation.dispensers_place_blocks]
Expand Down
4 changes: 4 additions & 0 deletions config/ftbquests/quests/chapters/chapter_one.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@
"Potions of all types may be brewed from surprisingly common ingredients. Be sure to check out what can be brewed, as potions will prove indispensable when facing off against the less friendly creatures that now roam the lands."
""
"Use the Mixing Cauldron to brew up some Potions of Ancient Knowledge, or any other potions you find interesting. Once brewed, they may be bottled by Right-Clicking the Cauldron with glass bottles."
""
"================================="
""
"Note that Hexerei potion fluids do not show in JEI. The simplest way to find the recipes is to look at the Vanilla potion, then check the uses on the ingredients. All potion ingredients are the same between the two systems."
]
id: "66585A158F41DE44"
rewards: [{
Expand Down
6 changes: 3 additions & 3 deletions config/ftbquests/quests/chapters/chapter_two.snbt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
""
"========================================"
""
"The Gateway for this fight is on a short timer. Capture a Wither and defeat the rest to obtain a Nether Star. The captured Wither will be used to mine Ether, which may be used to produce more Nether Stars. "
"The Gateway for this fight is on a short timer. Capture a Wither and defeat the rest to obtain a Nether Star. The captured Wither will be used to mine Blighted Ichor, which may be used to produce more Nether Stars. "
""
"Feel free to repeat this fight, but it is not intended to be needed more than once. "
]
Expand Down Expand Up @@ -310,7 +310,7 @@
y: 6.0d
}
{
dependencies: ["1D0AA79380E87E57"]
dependencies: ["7563E41DBF4FD286"]
description: [
"It is time once more to enlist the aid of the elemental spirits, this time to bring forth materials from the depths of their environments. By focusing tight beams of focused Source through these bases, the elementals will be able to retrieve what is needed. "
""
Expand Down Expand Up @@ -593,7 +593,7 @@
"The following multiblock machines may be constructed with Adept Artificing Blocks:"
""
"● Industrial Fermenter"
"● Industrial Sqeezer"
"● Industrial Squeezer"
"● Refinery"
"● Crusher"
]
Expand Down
4 changes: 2 additions & 2 deletions kubejs/client_scripts/constants/jei_hidden_disabled.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ jei.base.items.disabled = [
'powah:capacitor_basic',
'powah:capacitor_basic_tiny',

'quark:feeding_trough',

'superiorshields:manasteel_shield',
'superiorshields:terrasteel_shield',
'superiorshields:elementium_shield',
Expand Down Expand Up @@ -276,8 +278,6 @@ jei.expert.items.disabled = [
'createaddition:portable_energy_interface',
'createaddition:digital_adapter',

'farmingforblockheads:feeding_trough',

'immersiveengineering:capacitor_hv',
'immersiveengineering:capacitor_lv',
'immersiveengineering:capacitor_mv',
Expand Down
148 changes: 148 additions & 0 deletions kubejs/server_scripts/base/loot_tables/blocks/minecraft/oak_leaves.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@
ServerEvents.blockLootTables((event) => {
event.addBlock(`minecraft:oak_leaves`, (table) => {
table.addPool((pool) => {
pool.rolls = 1.0;
pool.bonusRolls = 0.0;
pool.addEntry({
type: 'minecraft:alternatives',
children: [
{
type: 'minecraft:item',
conditions: [
{
condition: 'minecraft:alternative',
terms: [
{
condition: 'minecraft:match_tool',
predicate: { items: ['minecraft:shears'] }
},
{
condition: 'minecraft:match_tool',
predicate: {
enchantments: [
{
enchantment: 'minecraft:silk_touch',
levels: { min: 1 }
}
]
}
}
]
}
],
name: 'minecraft:oak_leaves'
},
{
type: 'minecraft:item',
conditions: [
{ condition: 'minecraft:survives_explosion' },
{
chances: [0.05, 0.0625, 0.083333336, 0.1],
condition: 'minecraft:table_bonus',
enchantment: 'minecraft:fortune'
}
],
name: 'minecraft:oak_sapling'
}
]
});
});

table.addPool((pool) => {
pool.rolls = 1.0;
pool.bonusRolls = 0.0;
pool.addEntry({
type: 'minecraft:item',
conditions: [
{
chances: [0.02, 0.022222223, 0.025, 0.033333335, 0.1],
condition: 'minecraft:table_bonus',
enchantment: 'minecraft:fortune'
}
],
functions: [
{
add: false,
count: { type: 'minecraft:uniform', max: 2.0, min: 1.0 },
function: 'minecraft:set_count'
},
{ function: 'minecraft:explosion_decay' }
],
name: 'minecraft:stick'
});
pool.addCondition({
condition: 'minecraft:inverted',
term: {
condition: 'minecraft:alternative',
terms: [
{
condition: 'minecraft:match_tool',
predicate: {
items: ['minecraft:shears']
}
},
{
condition: 'minecraft:match_tool',
predicate: {
enchantments: [
{
enchantment: 'minecraft:silk_touch',
levels: {
min: 1
}
}
]
}
}
]
}
});
});

table.addPool((pool) => {
pool.rolls = [3, 5];
pool.bonusRolls = 0.0;
pool.addEntry({
type: 'minecraft:item',
conditions: [
{
condition: 'minecraft:survives_explosion'
},
{
chances: [0.04, 0.044444446, 0.05, 0.066666667, 0.2],
condition: 'minecraft:table_bonus',
enchantment: 'minecraft:fortune'
}
],
name: 'minecraft:apple'
});
pool.addCondition({
condition: 'minecraft:inverted',
term: {
condition: 'minecraft:alternative',
terms: [
{
condition: 'minecraft:match_tool',
predicate: {
items: ['minecraft:shears']
}
},
{
condition: 'minecraft:match_tool',
predicate: {
enchantments: [
{
enchantment: 'minecraft:silk_touch',
levels: {
min: 1
}
}
]
}
}
]
}
});
});
});
});
Loading

0 comments on commit f5f1757

Please sign in to comment.