diff --git a/1.20.1-FearFactoryTest/minecraft/config/aftershock.json b/1.20.1-FearFactoryTest/minecraft/config/aftershock.json deleted file mode 100644 index 818dc9d..0000000 --- a/1.20.1-FearFactoryTest/minecraft/config/aftershock.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "shotgun_damage": 25.0, - "americandirtdevil_health": 12.0, - "americandirtdevil_exp": 2, - "americandirtdevil_damage": 3, - "americandirtdevil_ram_damage": 8, - "americangraboid_health": 80.0, - "americangraboid_armor": 5, - "americangraboid_exp": 10, - "americangraboid_damage": 6, - "americanshreiker_health": 20.0, - "americanshreiker_exp": 4, - "americanshreiker_damage": 6, - "americanblaster_health": 40.0, - "americanblaster_exp": 8, - "americanblaster_damage": 8 -} \ No newline at end of file diff --git a/1.20.1-FearFactoryTest/minecraft/config/attributefix.json b/1.20.1-FearFactoryTest/minecraft/config/attributefix.json index f586636..ca30206 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/attributefix.json +++ b/1.20.1-FearFactoryTest/minecraft/config/attributefix.json @@ -517,17 +517,6 @@ "value": 10000 } }, - "irons_spellbooks:max_mana": { - "enabled": false, - "min": { - "default": 0, - "value": 0 - }, - "max": { - "default": 1000000, - "value": 1000000 - } - }, "ars_nouveau:ars_nouveau.perk.warding": { "enabled": false, "min": { @@ -539,6 +528,17 @@ "value": 1024 } }, + "irons_spellbooks:max_mana": { + "enabled": false, + "min": { + "default": 0, + "value": 0 + }, + "max": { + "default": 1000000, + "value": 1000000 + } + }, "minecraft:generic.knockback_resistance": { "enabled": true, "min": { @@ -704,17 +704,6 @@ "value": 10000 } }, - "irons_spellbooks:summon_damage": { - "enabled": false, - "min": { - "default": -100, - "value": -100 - }, - "max": { - "default": 100, - "value": 100 - } - }, "ars_nouveau:ars_nouveau.perk.saturation": { "enabled": false, "min": { @@ -726,6 +715,17 @@ "value": 10000 } }, + "irons_spellbooks:summon_damage": { + "enabled": false, + "min": { + "default": -100, + "value": -100 + }, + "max": { + "default": 100, + "value": 100 + } + }, "irons_spellbooks:eldritch_spell_power": { "enabled": false, "min": { @@ -1056,17 +1056,6 @@ "value": 4 } }, - "irons_spellbooks:ender_magic_resist": { - "enabled": false, - "min": { - "default": -100, - "value": -100 - }, - "max": { - "default": 100, - "value": 100 - } - }, "ars_nouveau:ars_nouveau.perk.feather": { "enabled": false, "min": { @@ -1078,6 +1067,17 @@ "value": 1 } }, + "irons_spellbooks:ender_magic_resist": { + "enabled": false, + "min": { + "default": -100, + "value": -100 + }, + "max": { + "default": 100, + "value": 100 + } + }, "minecraft:generic.armor": { "enabled": true, "min": { diff --git a/1.20.1-FearFactoryTest/minecraft/config/incontrol/loot.json b/1.20.1-FearFactoryTest/minecraft/config/incontrol/loot.json index 0637a08..a97f11f 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/incontrol/loot.json +++ b/1.20.1-FearFactoryTest/minecraft/config/incontrol/loot.json @@ -1 +1,7 @@ -[] \ No newline at end of file +[ +{ + "mod":["alexscaves","alexsmobs","aquamirae","arphex","betterend","betternether","born_in_chaos_v1","cataclysm","darkwaters","darwiniv","ender_wyrmlings","iceandfire","ihfr","legendary_monsters","man","minecraft","os","rats","spore","sweet_calamity","thalassophobia","the_deep_void","undead_unleashed","under_the_moon","undergarden","zoniex"], + "player":false, + "removeall":true +} +] \ No newline at end of file diff --git a/1.20.1-FearFactoryTest/minecraft/config/incontrol/spawn.json b/1.20.1-FearFactoryTest/minecraft/config/incontrol/spawn.json index ea0e9b6..6bfc693 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/incontrol/spawn.json +++ b/1.20.1-FearFactoryTest/minecraft/config/incontrol/spawn.json @@ -1,10 +1,19 @@ [ { - "mod": "organisorium", + "mod": ["os","man","spore","thalassophobia","darkwaters"], "spawner": false, "incontrol": false, "result": "deny" -} +}, +{ + "mod":["alexscaves","alexsmobs","aquamirae","arphex","betterend","betternether","born_in_chaos_v1","cataclysm","darkwaters","darwiniv","ender_wyrmlings","iceandfire","ihfr","legendary_monsters","man","os","rats","spore","sweet_calamity","thalassophobia","the_deep_void","undead_unleashed","under_the_moon","undergarden","zoniex"], + "spawner":false, + "mincount":{ + "amount":250, + "mob":"all" + }, + "result":"deny" +}, { "mod": "os", "spawner": false, @@ -17,5 +26,11 @@ "seesky": true, "notcolliding":true, "result": "allow" +}, +{ + "mod":"thalassophobia", + "spawner":false, + "dimension":"oceanworld:deepsea", + "result":"allow" } ] \ No newline at end of file diff --git a/1.20.1-FearFactoryTest/minecraft/config/incontrol/spawner.json b/1.20.1-FearFactoryTest/minecraft/config/incontrol/spawner.json index dc9a781..2242b00 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/incontrol/spawner.json +++ b/1.20.1-FearFactoryTest/minecraft/config/incontrol/spawner.json @@ -1,13 +1,276 @@ [ { - "mod":"organisorium", + "mob":[ +"os:actual_carcass", +"os:ambiant_grabber", +"os:bothriechis", +"os:brute", +"os:cracked_axolotl", +"os:decelluralized_carcass_corpse", +"os:deformed", +"os:glutton", +"os:harvester_drone", +"os:horder", +"os:incomplete_animal_form", +"os:incomplete_form", +"os:incomplete_monster_form", +"os:infected_sheep", +"os:kidnapper", +"os:maw", +"os:peac_keeper_biohybrid", +"os:reanimated_chicken", +"os:reanimated_cod", +"os:reanimated_cow", +"os:reanimated_drowned", +"os:reanimated_horse", +"os:reanimated_human", +"os:reanimated_human_corpse", +"os:reanimated_human_weak", +"os:reanimated_pig", +"os:reanimated_polar_bear", +"os:reanimated_salmon", +"os:reanimated_squid", +"os:reanimated_villager", +"os:reanimated_wolf", +"os:sea_crawler", +"os:shattered_bee", +"os:shattered_iron_golem", +"os:stuffed_reanimated_scientist", +"os:the_molten", +"os:the_twins", +"os:unidentifyable_incomplete_form", +"os:vermin_male", +"os:water_mob_phase_spawn"], "persecond":0.5, "conditions":{ - "maxthis":25, + "maxthis":50, + "mindist":60, "dimension":"ihfr:the_carnage", "and":{ "seesky":true } } +}, +{ + "mob":[ +"thalassophobia:colossoteus", +"thalassophobia:mosasaur", +"thalassophobia:reaverfish", +"thalassophobia:tusoteuthis", +"thalassophobia:xiphactinus", +"darkwaters:miraid"], + "persecond":0.001, + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 2 + } +}, +{ + "mob":[ +"thalassophobia:ammonita", +"thalassophobia:anglerfish", +"thalassophobia:archelon", +"thalassophobia:baby_colossoteus", +"thalassophobia:dunkleosteus", +"thalassophobia:megalodon", +"thalassophobia:plesiosaur", +"thalassophobia:reaverfish", +"darkwaters:craeken", +"darkwaters:manaraw", +"darkwaters:sight_hunter"], + "persecond":0.05, + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 8 + } +}, +{ + "mob":[ +"thalassophobia:ammonita", +"thalassophobia:anglerfish", +"thalassophobia:dunkleosteus", +"thalassophobia:electrophorus", +"thalassophobia:maka_maka_swim", +"thalassophobia:manta", +"thalassophobia:megastar", +"thalassophobia:riffhead", +"thalassophobia:sea_bird", +"thalassophobia:shark", +"thalassophobia:sunfish", +"thalassophobia:xiphactinus"], + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 20 + } +}, +{ + "mob":[ +"thalassophobia:bathotrap", +"thalassophobia:crab", +"thalassophobia:maka_maka", +"thalassophobia:sea_sludge"], + "conditions": { + "dimension":"oceanworld:deepsea", + "validspawn":true, + "mindist":60, + "maxdist":100, + "maxthis": 20 + } +}, +{ + "mob":"thalassophobia:cnidaria", + "amount":{ + "minimum":5, + "maximum":10, + "groupdistance":0.01 + }, + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 20 + } +}, +{ + "mob":"thalassophobia:eurypterid", + "amount":{ + "minimum":2, + "maximum":5, + "groupdistance":0.01 + }, + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 10 + } +}, +{ + "mob":"thalassophobia:gulper_eel", + "amount":{ + "minimum":2, + "maximum":5, + "groupdistance":0.01 + }, + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 10 + } +}, +{ + "mob":"thalassophobia:megapiranha", + "amount":{ + "minimum":5, + "maximum":7, + "groupdistance":0.01 + }, + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 15 + } +}, +{ + "mob":"thalassophobia:vertebrat", + "amount":{ + "minimum":2, + "maximum":5, + "groupdistance":0.01 + }, + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 10 + } +}, +{ + "mob":"thalassophobia:zapfin", + "amount":{ + "minimum":5, + "maximum":7, + "groupdistance":0.01 + }, + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 15 + } +}, +{ + "mob":"darkwaters:aberration", + "amount":{ + "minimum":2, + "maximum":3, + "groupdistance":0.01 + }, + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 5 + } +}, +{ + "mob":"darkwaters:mohast", + "amount":{ + "minimum":2, + "maximum":3, + "groupdistance":0.01 + }, + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 5 + } +}, +{ + "mob":"thalassophobia:panderodus", + "amount":{ + "minimum":5, + "maximum":7, + "groupdistance":0.01 + }, + "conditions": { + "dimension":"oceanworld:deepsea", + "norestrictions":true, + "inwater": true, + "mindist":60, + "maxdist":100, + "maxthis": 15 + } } ] \ No newline at end of file diff --git a/1.20.1-FearFactoryTest/minecraft/config/random_mob_sizes.backup.txt b/1.20.1-FearFactoryTest/minecraft/config/random_mob_sizes.backup.txt index f480aac..7cdcf2c 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/random_mob_sizes.backup.txt +++ b/1.20.1-FearFactoryTest/minecraft/config/random_mob_sizes.backup.txt @@ -79,32 +79,25 @@ "scale_damage": "normal", "scale_speed": "normal" }, - "alexscaves:tremorzilla": { + "os:the_molten": { "type": "static", "scaling": 5.0, - "scale_loot": true, - "scale_xp": true, + "scaling": 10.0, + "scale_loot": false, + "scale_xp": false, "scale_health": "normal", "scale_damage": "normal", "scale_speed": "normal" }, - "arphex:spider_brood": { + "the_deep_void:wanderer": { "type": "static", - "scaling": 10.0, - "scale_loot": true, - "scale_xp": true, - "scale_health": "normal", - "scale_damage": "normal", - "scale_speed": "normal" - } - "arphex:spider_larvae_tiny": { - "type": "static", - "scaling": 10.0, + "scaling": 1.5, "scale_loot": true, "scale_xp": true, "scale_health": "normal", "scale_damage": "normal", "scale_speed": "normal" + "scale_speed": "none" } } } diff --git a/1.20.1-FearFactoryTest/minecraft/config/random_mob_sizes.json b/1.20.1-FearFactoryTest/minecraft/config/random_mob_sizes.json index a38c0f6..bb8fbad 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/random_mob_sizes.json +++ b/1.20.1-FearFactoryTest/minecraft/config/random_mob_sizes.json @@ -25,6 +25,15 @@ "scale_damage": "normal", "scale_speed": "none" }, + "thalassophobia:colossoteus": { + "type": "static", + "scaling": 2.0, + "scale_loot": false, + "scale_xp": false, + "scale_health": "normal", + "scale_damage": "normal", + "scale_speed": "square" + }, "born_in_chaos_v1:felsteed": { "type": "static", "scaling": 1.3, @@ -72,13 +81,31 @@ }, "magma_monsters:magma_monster": { "type": "static", - "scaling": 3.0, + "scaling": 10.0, "scale_loot": true, "scale_xp": true, "scale_health": "normal", "scale_damage": "normal", "scale_speed": "normal" }, + "arphex:spider_lurker": { + "type": "static", + "scaling": 3.0, + "scale_loot": false, + "scale_xp": false, + "scale_health": "normal", + "scale_damage": "normal", + "scale_speed": "none" + }, + "thalassophobia:sunfish": { + "type": "static", + "scaling": 5.0, + "scale_loot": false, + "scale_xp": false, + "scale_health": "normal", + "scale_damage": "normal", + "scale_speed": "none" + }, "os:the_molten": { "type": "static", "scaling": 10.0, diff --git a/1.20.1-FearFactoryTest/minecraft/config/sanitydim/default.toml b/1.20.1-FearFactoryTest/minecraft/config/sanitydim/default.toml index 5e6596f..a12de38 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/sanitydim/default.toml +++ b/1.20.1-FearFactoryTest/minecraft/config/sanitydim/default.toml @@ -5,10 +5,10 @@ [sanity] #For balancing purposes: the effectiveness of all positive sanity sources will be multiplied by this number #Range: 1.401298464324817E-45 ~ 3.4028234663852886E38 - positive_multiplier = 1.2 + positive_multiplier = 1.5 #For balancing purposes: the effectiveness of all negative sanity sources will be multiplied by this number #Range: 1.401298464324817E-45 ~ 3.4028234663852886E38 - negative_multiplier = 8.0 + negative_multiplier = 1.5 #Configuration for passive sanity sources [sanity.passive] diff --git a/1.20.1-FearFactoryTest/minecraft/config/voicechat/voicechat-client.properties b/1.20.1-FearFactoryTest/minecraft/config/voicechat/voicechat-client.properties index 17f9263..74645c8 100644 --- a/1.20.1-FearFactoryTest/minecraft/config/voicechat/voicechat-client.properties +++ b/1.20.1-FearFactoryTest/minecraft/config/voicechat/voicechat-client.properties @@ -1,16 +1,16 @@ # Simple Voice Chat client config v1.20.1-2.5.30 # If the voice chat onboarding process has been finished -onboarding_finished=false +onboarding_finished=true # The voice chat volume voice_chat_volume=1.0 # The threshold for the voice activation method (in dB) -voice_activation_threshold=-50.0 +voice_activation_threshold=-34.95074189231737 # The voice chat microphone amplification microphone_amplification=1.0 # The microphone activation method # Valid values are 'PTT' and 'VOICE' -microphone_activation_type=PTT +microphone_activation_type=VOICE # The size of the audio output buffer (in packets) # Higher values mean a higher latency but less crackling # Increase this value if you have an unstable internet connection @@ -24,12 +24,12 @@ audio_packet_threshold=3 voice_deactivation_delay=25 # The microphone used by the voice chat # Leave blank to use the default device -microphone= +microphone=OpenAL Soft on Microphone (High Definition Audio Device) # The speaker used by the voice chat # Leave blank to use the default device -speaker= +speaker=OpenAL Soft on Speakers (High Definition Audio Device) # If the microphone is muted (only relevant for the voice activation method) -muted=true +muted=false # If the voice chat is disabled (both sound and microphone off) disabled=false # If the voice chat HUD, group chat HUD, and other in-game icons should be hidden @@ -64,7 +64,7 @@ recording_destination= # 0 = highest quality, 9 = lowest quality recording_quality=2 # If noise suppression should be enabled -denoiser=false +denoiser=true # If the voice chat should work in singleplayer or in worlds shared over LAN run_local_server=true # Whether to use the Java implementation of microphone capture instead of OpenAL diff --git a/1.20.1-FearFactoryTest/minecraft/mods/benate-1.0.0-forge-1.20.1.jar b/1.20.1-FearFactoryTest/minecraft/mods/benate-1.0.0-forge-1.20.1.jar deleted file mode 100644 index 6bc6c3c..0000000 --- a/1.20.1-FearFactoryTest/minecraft/mods/benate-1.0.0-forge-1.20.1.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8ba5277199abd9311473f467838280cb899081973d6c04452517613f8a3aca40 -size 703072 diff --git a/1.20.1-FearFactoryTest/minecraft/mods/player-animation-lib-forge-1.0.2-rc1+1.20.jar b/1.20.1-FearFactoryTest/minecraft/mods/player-animation-lib-forge-1.0.2-rc1+1.20.jar deleted file mode 100644 index 5d0be10..0000000 --- a/1.20.1-FearFactoryTest/minecraft/mods/player-animation-lib-forge-1.0.2-rc1+1.20.jar +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90d9965cb9efdbda29fdc5610be3914cf7008bf5c392ff34f7ab25f96a852691 -size 181437 diff --git a/1.20.1-FearFactoryTest/minecraft/mods/pressure-1.5-forge-1.20.1.jar b/1.20.1-FearFactoryTest/minecraft/mods/pressure-1.5-forge-1.20.1.jar new file mode 100644 index 0000000..23baf09 --- /dev/null +++ b/1.20.1-FearFactoryTest/minecraft/mods/pressure-1.5-forge-1.20.1.jar @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fa2c38d872be6f26a7fa8e1ba35b5c1c0ac223cf82929598c1de66cc0eb313c +size 1642687