Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Ice & Fire to version 1.8.1 #1340

Merged
merged 1 commit into from
Sep 8, 2019
Merged

Update Ice & Fire to version 1.8.1 #1340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions config/cofh/thermalexpansion/morbs.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,20 @@
Blacklist {
# List of entities that are not allowed to be placed in Morbs. Mobs without spawn eggs are automatically disallowed. [default: ]
S:Blacklist <
iceandfire:icedragon
iceandfire:firedragon
iceandfire:cyclops
iceandfire:deathwormegg
iceandfire:dragonegg
iceandfire:dragonskull
iceandfire:firedragon
iceandfire:gorgon
iceandfire:hippogryphegg
iceandfire:icedragon
iceandfire:if_cockatriceegg
iceandfire:if_mob_skull
iceandfire:myrmex_egg
iceandfire:myrmex_queen
iceandfire:stonestatue
iceandfire:tide_trident
>
}

Expand Down
16 changes: 11 additions & 5 deletions config/cyclicmagic.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,14 +1812,20 @@ modpacks {
minecraft:wither
minecraft:ender_dragon
minecraft:ender_crystal
iceandfire:icedragon
iceandfire:firedragon
iceandfire:dragonskull
iceandfire:cyclops
iceandfire:deathwormegg
iceandfire:dragonegg
iceandfire:dragonskull
iceandfire:firedragon
iceandfire:gorgon
iceandfire:stonestatue
iceandfire:stymphalianfeather
iceandfire:hippogryphegg
iceandfire:icedragon
iceandfire:if_cockatriceegg
iceandfire:if_mob_skull
iceandfire:myrmex_egg
iceandfire:myrmex_queen
iceandfire:stonestatue
iceandfire:tide_trident
>
}

Expand Down
10 changes: 5 additions & 5 deletions config/enderio/recipes/user/spawner.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<enderio:recipes xmlns:enderio="http://enderio.com/recipes" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://enderio.com/recipes recipes.xsd ">
<recipe name="Spawner, defaults" required="true">
<recipe name="Spawner, defaults" required="true">
<spawning>
<entity name="minecraft:villager" costMultiplier="10.0" disabled="false"/>
</spawning>
<entity name="minecraft:villager" costMultiplier="10.0" disabled="false"/>
</spawning>
</recipe>
<recipe name="Spawner, Ice and Fire" required="false">
<spawning>
<entity name="iceandfire:firedragon" costMultiplier="30.0" disabled="false"/>
<entity name="iceandfire:firedragon" costMultiplier="30.0" disabled="false"/>
<entity name="iceandfire:icedragon" costMultiplier="30.0" disabled="false"/>
<entity name="iceandfire:icevillager" costMultiplier="1.0" disabled="false"/>
<entity name="iceandfire:snowvillager" costMultiplier="1.0" disabled="false"/>
</spawning>
</recipe>
</enderio:recipes>
Expand Down
24 changes: 21 additions & 3 deletions config/forestry/backpacks.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,14 +198,30 @@ backpacks {
iceandfire:deathworm_chitin
iceandfire:stymphalian_bird_feather:0
iceandfire:troll_tusk:0
iceandfire:troll_teather_forest:0
iceandfire:troll_teather_frost:0
iceandfire:troll_teather_mountain:0
iceandfire:troll_leather_forest:0
iceandfire:troll_leather_frost:0
iceandfire:troll_leather_mountain:0
iceandfire:myrmex_desert_resin:0
iceandfire:myrmex_jungle_resin:0
iceandfire:myrmex_desert_chitin:0
iceandfire:myrmex_jungle_chitin:0
iceandfire:pixie_dust:0
iceandfire:pixie_wings:0
iceandfire:deathworm_tounge:0
iceandfire:cockatrice_eye:0
iceandfire:amphithere_feather:0
iceandfire:siren_tear:0
iceandfire:hippogryph_talon:0
iceandfire:cyclops_eye:0
iceandfire:hippocampus_fin:0
iceandfire:sea_serpent_fang:0
iceandfire:amphithere_skull:0
iceandfire:cockatrice_skull:0
iceandfire:cyclops_skull:0
iceandfire:hippogryph_skull:0
iceandfire:seaserpent_skull:0
iceandfire:stymphalian_skull:0
iceandfire:troll_skull:0
>

# Add itemStacks for the forestry.hunter's backpack here in the format 'modid:name:meta'. For wildcard metadata the format is 'modid:name'.
Expand Down Expand Up @@ -310,6 +326,8 @@ backpacks {
iceandfire:myrmex_jungle_resin_glass:0
iceandfire:desert_myrmex_cocoon:0
iceandfire:jungle_myrmex_coccon:0
iceandfire:dragon_bone_block:0
iceandfire:dragon_bone_wall:0
>

# Add itemStacks for the forestry.builder's backpack here in the format 'modid:name:meta'. For wildcard metadata the format is 'modid:name'.
Expand Down
30 changes: 25 additions & 5 deletions config/ice_and_fire.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ all {
# Maximum amphithere health [range: 1.0 ~ 10000.0, default: 50.0]
S:"Amphithere Max Health"=50.0

# Amphithere spawn weight. Lower = lower chance to spawn [range: 1 ~ 10000, default: 10]
I:"Amphithere Spawn Weight"=10
# Amphithere spawn weight. Lower = lower chance to spawn [range: 1 ~ 10000, default: 5]
I:"Amphithere Spawn Weight"=5

# How many ticks it takes while riding an untamed amphithere to tame it. [range: 1 ~ 10000, default: 400]
I:"Amphithere Tame Time"=400
Expand All @@ -22,13 +22,21 @@ all {
# True if animals should run away and hide from dragons and other hostile Ice and Fire mobs. [default: true]
B:"Animals Fear Dragons"=true

# Blacklist for blocks that dragons are not to break or burn. Ex. "minecraft:chest" or "rats:rat_crafting_table" [default: ]
S:"Blacklisted Blocks from Dragon" <
>

# Dragons cannot spawn in these dimensions' IDs
I:"Blacklisted Dragon Dimensions" <
-1
1
>

# Snow Villages cannot spawn in these dimensions' IDs
# Misc Structures(Cyclops caves, Gorgon temples, etc) cannot spawn in these dimensions' IDs
I:"Blacklisted Misc. Structure Dimensions" <
-1
1
>
I:"Blacklisted Snow Village Dimensions" <
-1
1
Expand Down Expand Up @@ -136,9 +144,15 @@ all {
# True if dragons can drop their skull on death. [default: true]
B:"Dragons Drop Skull"=true

# Default attack strength of a dragonsteel sword. [range: 5.0 ~ 2.14748365E9, default: 25.0]
S:"Dragonsteel Sword Base Attack Strength"=25.0

# Turning this to true simplifies the dragon's pathfinding process, making them dumber when finding a path, but better for servers with many loaded dragons. [default: false]
B:"Experimental Dragon path Finder"=false

# Whether to generate structures or mobs on superflat worlds [default: true]
B:"Generate All Structures on Superflat"=true

# 1 out of this number chance per chunk for generation [range: 1 ~ 10000, default: 180]
I:"Generate Dragon Cave Chance"=250

Expand Down Expand Up @@ -184,12 +198,15 @@ all {
# Whether to log cascading world gen lag. We hope to fix all cascading lag in the future, but the server console spam is over the top. [default: false]
B:"Log Cascading World Gen"=false

# How high dragons can fly, in Y height. [range: 10 ~ 1000, default: 128]
# How high dragons can fly, in Y height. [range: 100 ~ 1000, default: 128]
I:"Max Dragon Flight Height"=128

# How high stymphalian birds can fly, in Y height. [range: 10 ~ 1000, default: 80]
I:"Max Stymphalian Bird Flight Height"=80

# Base Myrmex(worker) attack strength [range: 1.0 ~ 10000.0, default: 3.0]
S:"Myrmex Base Attack Strength"=3.0

# One out of this number chance per chunk to generate a myrmex hive. [range: 1 ~ 10000, default: 150]
I:"Myrmex Colony Gen Chance"=10000

Expand Down Expand Up @@ -344,7 +361,10 @@ all {
122
>

# Snow Villages can only spawn in these dimensions' IDs
# Misc Structures(Cyclops caves, Gorgon temples, etc) can only spawn in these dimensions' IDs
I:"Whitelisted Misc. Structure Dimensions" <
0
>
I:"Whitelisted Snow Village Dimensions" <
>

Expand Down
16 changes: 8 additions & 8 deletions minecraftinstance.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -330,19 +330,19 @@
"fileSize": 2563518
},
{
"folderName": "iceandfire-1.7.1-1.12.2.jar",
"fingerprint": 1912831700,
"fileDateHash": 198874602,
"folderName": "iceandfire-1.8.1.jar",
"fingerprint": 340459494,
"fileDateHash": 204385764,
"sectionID": 8,
"individualFingerprints": [
1912831700
340459494
],
"status": 1,
"timestamp": "2019-07-22T18:05:23.8815566Z",
"lastWriteTimeUtc": "2019-03-31T06:40:23.7055276Z",
"queryTimestamp": "2019-09-02T18:11:36.894656Z",
"timestamp": "2019-09-07T19:28:16.6601806Z",
"lastWriteTimeUtc": "2019-09-01T06:51:21.4397297Z",
"queryTimestamp": "2019-09-07T19:28:17.3990206Z",
"fileCount": 1,
"fileSize": 16086478
"fileSize": 19422597
},
{
"folderName": "MysticalAgriculture-1.12.2-1.7.5.jar",
Expand Down
20 changes: 20 additions & 0 deletions scripts/IceAndFire.zs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,26 @@ print("--- loading IceAndFire.zs ---");
<iceandfire:dragonbone_axe>,
<iceandfire:dragonbone_pickaxe>,
<iceandfire:dragonbone_shovel>,
<iceandfire:dragonsteel_fire_axe>,
<iceandfire:dragonsteel_fire_hoe>,
<iceandfire:dragonsteel_fire_pickaxe>,
<iceandfire:dragonsteel_fire_shovel>,
<iceandfire:dragonsteel_fire_sword>,
<iceandfire:dragonsteel_ice_axe>,
<iceandfire:dragonsteel_ice_hoe>,
<iceandfire:dragonsteel_ice_pickaxe>,
<iceandfire:dragonsteel_ice_shovel>,
<iceandfire:dragonsteel_ice_sword>,
<iceandfire:myrmex_desert_axe>,
<iceandfire:myrmex_desert_hoe>,
<iceandfire:myrmex_desert_pickaxe>,
<iceandfire:myrmex_desert_shovel>,
<iceandfire:myrmex_desert_sword>,
<iceandfire:myrmex_jungle_axe>,
<iceandfire:myrmex_jungle_hoe>,
<iceandfire:myrmex_jungle_pickaxe>,
<iceandfire:myrmex_jungle_shovel>,
<iceandfire:myrmex_jungle_sword>,
<iceandfire:wither_shard>,
<iceandfire:silver_ore>
] as IItemStack[];
Expand Down
23 changes: 14 additions & 9 deletions scripts/LootTweaker_Ice&Fire.zs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,18 @@ print("--- loading LootTweaker_Ice&Fire.zs ---");

val cyclops_cave = LootTables.getTable("iceandfire:cyclops_cave");
val cyclops_cave_pool = cyclops_cave.getPool("cyclops_cave");
val cyclops_cave_main = cyclops_cave.getPool("main");

val fire_dragon_cave = LootTables.getTable("iceandfire:fire_dragon_cave");
val fire_dragon_cave_pool = fire_dragon_cave.getPool("fire_dragon_cave");
val fire_dragon_cave_main = fire_dragon_cave.getPool("main");
val fire_dragon_female_cave = LootTables.getTable("iceandfire:fire_dragon_female_cave");
val fire_dragon_female_cave_pool = fire_dragon_female_cave.getPool("fire_dragon_cave");

val fire_dragon_male_cave = LootTables.getTable("iceandfire:fire_dragon_male_cave");
val fire_dragon_male_cave_pool = fire_dragon_male_cave.getPool("fire_dragon_cave");

val ice_dragon_cave = LootTables.getTable("iceandfire:ice_dragon_cave");
val ice_dragon_cave_pool = ice_dragon_cave.getPool("ice_dragon_cave");
val ice_dragon_cave_main = ice_dragon_cave.getPool("main");
val ice_dragon_female_cave = LootTables.getTable("iceandfire:ice_dragon_female_cave");
val ice_dragon_female_cave_pool = ice_dragon_female_cave.getPool("ice_dragon_cave");

val ice_dragon_male_cave = LootTables.getTable("iceandfire:ice_dragon_male_cave");
val ice_dragon_male_cave_pool = ice_dragon_male_cave.getPool("ice_dragon_cave");

val caveloot = [
<environmentaltech:litherite_crystal>,
Expand Down Expand Up @@ -61,8 +64,10 @@ print("--- loading LootTweaker_Ice&Fire.zs ---");
for item in caveloot {

cyclops_cave_pool.addItemEntry(item, 3);
fire_dragon_cave_pool.addItemEntry(item, 3);
ice_dragon_cave_pool.addItemEntry(item, 3);
fire_dragon_female_cave_pool.addItemEntry(item, 3);
fire_dragon_male_cave_pool.addItemEntry(item, 3);
ice_dragon_female_cave_pool.addItemEntry(item, 3);
ice_dragon_male_cave_pool.addItemEntry(item, 3);

}

Expand Down