From 0555f6385741dbc8753fe8a49908ea0d0453bd22 Mon Sep 17 00:00:00 2001 From: chochem <40274384+chochem@users.noreply.github.com> Date: Thu, 19 Dec 2024 14:28:18 +0000 Subject: [PATCH] EFR update (#18424) --- config/etfuturum/blocksitems.cfg | 85 +++++++++++++++++++------------- config/etfuturum/entities.cfg | 3 ++ config/etfuturum/experiments.cfg | 4 ++ config/etfuturum/functions.cfg | 12 ----- config/etfuturum/mixins.cfg | 7 +++ config/etfuturum/tweaks.cfg | 6 +++ config/etfuturum/world.cfg | 9 +++- 7 files changed, 79 insertions(+), 47 deletions(-) diff --git a/config/etfuturum/blocksitems.cfg b/config/etfuturum/blocksitems.cfg index 5748d8f50..a392b3702 100644 --- a/config/etfuturum/blocksitems.cfg +++ b/config/etfuturum/blocksitems.cfg @@ -13,9 +13,9 @@ # New boats from 1.9+, including the new rowing sounds. All vanilla wood variants included. [default: true] B:enableNewBoats=true - # What entities shouldn't be able to sit in the boat? You can either provide an entity ID (modid.entityid, for vanilla entities type just entity ID), or search for a string in the classpath (classpath:stringtofind). + # What entities shouldn't be able to sit in the boat? This is ONLY for new boats. You can either provide an entity ID (modid.entityid, for vanilla entities type just entity ID), or search for a string in the classpath (classpath:stringtofind). # Separate entries in the list by a new line. Note that players can always sit even if blacklisted, and some entities, like horses, water mobs or nonliving entities, will never be allowed to sit in boats. - # It's a little hard to explain, a more detailed explanation and list of examples can be found here: https://pastebin.com/XNZ7VWKh + # It's a little hard to explain, a more detailed explanation and list of examples can be found here: https://gist.github.com/Roadhog360/0a9975d113217e65cc6b06c494454e4f S:newBoatEntityBlacklist < > @@ -45,10 +45,10 @@ ########################################################################################################## equipment { - # [range: 1 ~ 2147483647, default: 37] + # Used by the game to generate the durability value for the armor set. The higher the better. [range: 1 ~ 2147483647, default: 37] I:netheriteArmourDurabilityFactor=37 - # Override Netherite Axe Durability, -1 to disable [range: -1 ~ 2147483647, default: -1] + # Override Netherite Axe Durability, -1 to use netheriteToolDurability [range: -1 ~ 2147483647, default: -1] I:netheriteAxeDurability=-1 # Override Netherite Boots Durability, -1 for no override [range: -1 ~ 2147483647, default: -1] @@ -63,7 +63,7 @@ equipment { # Netherite Chestplate Protection [range: 1 ~ 2147483647, default: 8] I:netheriteChestplateProtection=8 - # Neterite base damage, Diamond is 3.0 [range: 0.0 ~ 3.4028235E38, default: 4.0] + # Netherite base damage, Diamond is 3.0 [range: 0.0 ~ 3.4028235E38, default: 4.0] S:netheriteDamageBase=4.0 # [range: 1 ~ 2147483647, default: 15] @@ -72,13 +72,13 @@ equipment { # Netherite harvest level, Diamond is 3 [range: 0 ~ 2147483647, default: 4] I:netheriteHarvestLevel=4 - # Override Netherite Helmet Durability, -1 to disable [range: -1 ~ 2147483647, default: -1] + # Override Netherite Helmet Durability, -1 to no override [range: -1 ~ 2147483647, default: -1] I:netheriteHelmetDurability=-1 # Netherite Helmet Protection [range: 1 ~ 2147483647, default: 3] I:netheriteHelmetProtection=3 - # Override Netherite Hoe Durability, -1 to disable [range: -1 ~ 2147483647, default: -1] + # Override Netherite Hoe Durability, -1 to use netheriteToolDurability [range: -1 ~ 2147483647, default: -1] I:netheriteHoeDurability=-1 # Override Netherite Leggings Durability, -1 for no override [range: -1 ~ 2147483647, default: -1] @@ -87,16 +87,16 @@ equipment { # Netherite Leggings Protection [range: 1 ~ 2147483647, default: 6] I:netheriteLeggingsProtection=6 - # Override Netherite Pickaxe Durability, -1 to disable [range: -1 ~ 2147483647, default: -1] + # Override Netherite Pickaxe Durability, -1 to use netheriteToolDurability [range: -1 ~ 2147483647, default: -1] I:netheritePickaxeDurability=-1 - # Override Netherite Shovel Durability, -1 to disable [range: -1 ~ 2147483647, default: -1] + # Override Netherite Shovel Durability, -1 to use netheriteToolDurability [range: -1 ~ 2147483647, default: -1] I:netheriteSpadeDurability=-1 - # Netherite mining speed, Diamond is 8.0 [range: 0.1 ~ 3.4028235E38, default: 9.0] + # Nethherite mining speed, Diamond is 8.0 [range: 0.1 ~ 3.4028235E38, default: 9.0] S:netheriteSpeed=9.0 - # Override Netherite Sword Durability, -1 to disable [range: -1 ~ 2147483647, default: -1] + # Override Netherite Sword Durability, -1 to use netheriteToolDurability [range: -1 ~ 2147483647, default: -1] I:netheriteSwordDurability=-1 # [range: 1 ~ 2147483647, default: 2031] @@ -132,10 +132,7 @@ equipment { # # Additionally the bone meal drop when harvesting a full composting bin can be changed. It drops one item from the "composting" loot table, and can be modified with CraftTweaker's "addChestLoot" function. # By default bone meal is the only item in this loot table, with a weight of 10. You can learn more about CraftTweaker loot table modification here: https://www.mcdrama.net/archiveformal/MineTweaker3/wiki/tutorials/1710/loot_and_seeds.html [default: true] - B:enableComposter=true - - # Enables wood variant doors [default: true] - B:enableDoors=false + B:enableComposter=false # Ability to craft differently colored beds out of wool. Mixed wool colors = red bed [default: true] B:enableDyedBeds=true @@ -168,6 +165,9 @@ equipment { # mods.etfuturum.brewingFuel.remove(); //(Removes blaze powder as a brewing fuel) [default: true] B:enableNewBrewingStand=true + # Enables variant doors for materials available in Minecraft after 1.7 [default: true] + B:enableNewDoors=false + # Uses lapis as payment and has enchant previews and adjusted level costs. Requires tile entity replacement to be enabled in "function.cfg". It is compatible with CraftTweaker for adding and removing fuels. # The mod prefix is "mods.etfuturum.enchantingFuel", and the function is "addFuel" and an ItemStack or OreDictionary tag. You can remove fuels using the "remove" function and an ItemStack or an OreDictionary tag. # Examples: @@ -175,6 +175,15 @@ equipment { # mods.etfuturum.enchantingFuel.remove(); //(Removes lapis lazuli as an enchanting fuel) [default: true] B:enableNewEnchantingTable=true + # Enables wood variant signs for materials available in Minecraft after 1.7 [default: true] + B:enableNewSigns=true + + # Enables variant trapdoors for materials available in Minecraft after 1.7 [default: true] + B:enableNewTrapdoors=true + + # Enables wood variant buttons and pressure plates for wood available in Minecraft after 1.7 [default: true] + B:enableNewWoodRedstone=true + # Enable the old Et Futurum daylight sensor block. Should be enabled if you still have the old Et Futurum copy of the non-inverted daylight detector that need to be converted. [default: false] B:enableOldBaseDaylightSensor=false @@ -184,9 +193,6 @@ equipment { # If Shulkers are disabled, a custom recipe will be required to obtain Shulker shells. [default: true] B:enableShulkerBoxes=true - # [default: true] - B:enableSigns=true - # Just bouncy, does not pull blocks. [default: true] B:enableSlimeBlock=true @@ -212,11 +218,17 @@ equipment { # Enables target block from 1.16 [default: true] B:enableTarget=true - # Enables wood variant trapdoors [default: true] - B:enableTrapdoors=false + # Enables variant doors for materials available natively in Minecraft 1.7 [default: true] + B:enableVanillaDoors=false + + # Enables variant signs for materials available natively in Minecraft 1.7 [default: true] + B:enableVanillaSigns=true - # Enables wood variant buttons and pressure plates [default: true] - B:enableWoodRedstone=true + # Enables variant trapdoors for materials available natively in Minecraft 1.7 [default: true] + B:enableVanillaTrapdoors=false + + # Enables wood variant buttons and pressure plates for wood available natively in Minecraft 1.7 [default: true] + B:enableVanillaWoodRedstone=true } @@ -257,12 +269,6 @@ equipment { # Stairs for vanilla blocks: stone brick, mossy stone brick, sandstone, brick, nether brick [default: true] B:enableExtraVanillaWalls=true - # Enables wood variant fences. [default: true] - B:enableFences=true - - # Enables wood variant gates. [default: true] - B:enableGates=false - # [default: true] B:enableGlazedTerracotta=true @@ -275,6 +281,12 @@ equipment { # Invisible light blocks. Only has a selection box when held, right click to change light level. Otherwise functionally identical to air and can be replaced by placing blocks into it. Invisible, but can be seen when holding it in Creative mode. [default: true] B:enableLightBlock=true + # Enables variant fences for materials available in Minecraft after 1.7 [default: true] + B:enableNewFences=false + + # Enables variant gates for materials available in Minecraft after 1.7 [default: true] + B:enableNewGates=false + # [default: true] B:enableQuartzBricks=true @@ -292,6 +304,12 @@ equipment { # Enables stripped log blocks [default: true] B:enableStrippedLogs=true + + # Enables variant fences for materials available natively in Minecraft 1.7 [default: true] + B:enableVanillaFences=false + + # Enablesvariant gates for materials available natively in Minecraft 1.7 [default: true] + B:enableVanillaGates=false } @@ -344,9 +362,6 @@ equipment { ########################################################################################################## "natural blocks" { - # Set how hard deepslate is, in case you like the look of deepslate but don't want to deal with the additional hardness. Regular stone is 1.5. [range: 0.0 ~ 100.0, default: 3.0] - S:deepslateHardness=2.3333333333 - # Enables tinted glass, amethyst blocks, budding amethyst and amethyst crystals. Also enables the item too. [default: true] B:enableAmethyst=false @@ -354,7 +369,7 @@ equipment { B:enableBambooBlocks=false # This must be on for the basalt deltas biome to generate unless Netherlicious is installed. [default: true] - B:enableBasalt=true + B:enableBasalt=false # [default: true] B:enableBlueIce=true @@ -405,7 +420,7 @@ equipment { B:enableNetherGold=false # [default: true] - B:enableNetherite=true + B:enableNetherite=false # [default: true] B:enableNetherwartBlock=true @@ -434,8 +449,10 @@ equipment { # [default: true] B:enableWitherRose=true + # NOTE: Currently the content below is referring to some things which are behind an experimental toggle. + # Additionally the new nether is NOT compatible with Netherlicious yet. The comment below refers to the plans for when the features below are complete. # Set this to false to easily turn off all Nether blocks. This also turns off all Nether biomes because they require the blocks to generate. - # My biomes have compat with Netherlicious (read world.cfg for more info) but if you don't want any compat at all turn this off. + # My biomes have compat with Netherlicious (read world.cfg for more info) but if you don't want any compat or EFR Nether stuff at all turn this off. # This disables the following toggles: enableCrimsonBlocks, enableWarpedBlocks, enableBlackstone, enableSoulSoil, enableSoulLighting and enableBasalt. # Amethyst geodes use smooth basalt so go to world.cfg to change the outer block to something else or they won't generate. # This also turns off Nether wart blocks even though they are older, because Netherlicious also has those. [default: true] diff --git a/config/etfuturum/entities.cfg b/config/etfuturum/entities.cfg index 1a1926bd9..a5e9eee1a 100644 --- a/config/etfuturum/entities.cfg +++ b/config/etfuturum/entities.cfg @@ -43,6 +43,9 @@ misc { # [default: true] B:enableShearableSnowGolems=true + # Squid now produce a cloud of floating black ink particles when attacked. [default: true] + B:enableSquidInk=true + # Villagers turn into Witches when struck by lightning [default: true] B:enableVillagerTurnsIntoWitch=true } diff --git a/config/etfuturum/experiments.cfg b/config/etfuturum/experiments.cfg index b4dda018e..ace9024b6 100644 --- a/config/etfuturum/experiments.cfg +++ b/config/etfuturum/experiments.cfg @@ -9,8 +9,12 @@ #--------------------------------------------------------------------------------------------------------# # Unfinished features. Handle with care! To automatically enable all of these at once, use "-Detfuturum.testing=true" in your program arguments. # For the safety of people playing any packs that include these features, a chat message will be issued when any of them are enabled. +# These features are not finished, may cause breakages and are subject to receive major changes at any time. +# This can also include breaking changes, and even changed IDs. +# # Note that when a config option has no comment at all, not even saying what the default value is, that means the option was removed. # In that case check the regular configs as it was likely moved there. +# ########################################################################################################## "experimental features -- tread carefully" { diff --git a/config/etfuturum/functions.cfg b/config/etfuturum/functions.cfg index a8808bed6..a66873727 100644 --- a/config/etfuturum/functions.cfg +++ b/config/etfuturum/functions.cfg @@ -262,15 +262,3 @@ settings { } -########################################################################################################## -# update_checker -#--------------------------------------------------------------------------------------------------------# -# Category solely for the update checker, to make it easier to find and disable for those who don't want it. -########################################################################################################## - -update_checker { - # Check and print a chat message in-game if there's a new update available? [default: true] - B:enableUpdateChecker=false -} - - diff --git a/config/etfuturum/mixins.cfg b/config/etfuturum/mixins.cfg index 6ff19b811..6a4276ed7 100644 --- a/config/etfuturum/mixins.cfg +++ b/config/etfuturum/mixins.cfg @@ -32,6 +32,10 @@ # Mofified Client Classes: net.minecraft.client.particle.EffectRenderer [default: true] B:boundedBlockBreakingParticles=true + # Grass block sides are colored in the player's inventory + # Modified Client Classes: net.minecraft.client.renderer.RenderBlocks [default: true] + B:colorGrassBlockItemSides=true + # When greater than 1, boosts creative flight speed when sprinting, like in newer versions [range: 1.0 ~ 4.0, default: 2.0] S:creativeFlightSpeedModifier=1.0 @@ -55,6 +59,9 @@ # Modified Classes: net.minecraft.world.World net.minecraft.world.WorldServer [default: true] B:enableObservers=true + # You nappa, you get slappa [default: true] + B:enablePlayersSleepingPecentageGamerule=false + # Add the randomTickSpeed game rule from 1.8+ [default: true] B:enableRandomTickSpeed=true diff --git a/config/etfuturum/tweaks.cfg b/config/etfuturum/tweaks.cfg index 03640bcd1..554b4e380 100644 --- a/config/etfuturum/tweaks.cfg +++ b/config/etfuturum/tweaks.cfg @@ -43,6 +43,12 @@ # If spawn anywhere is enabled, spawn Shulkers matching the color of modded biome blocks. Currently supports Enderlicious and Hardcore Ender Expansion terrain blocks. [default: true] B:spawnAnywhereShulkerColors=true + + # Squids will blind players when they take damage. [default: false] + B:squidsBlindPlayers=false + + # If you want stonecutters to deal damage to players standing on them. [default: false] + B:stonecutterSawHurts=false } diff --git a/config/etfuturum/world.cfg b/config/etfuturum/world.cfg index 0dece18ee..9f310c78c 100644 --- a/config/etfuturum/world.cfg +++ b/config/etfuturum/world.cfg @@ -77,6 +77,9 @@ generation { # How rare should amethyst geodes be? 1/x chance per chunk, 1 means a geode attempts to appear every chunk [range: 1 ~ 127, default: 53] I:amethystRarity=53 + # Whether bamboo should naturally spawn in the overworld. Turning this off allows you to use bamboo based blocks without bamboo world gen for mod compatability. [default: true] + B:bambooWorldgen=false + # 0 = Budding amethyst cannot be obtained at all even with silk touch. When using this option, attempting to push them using a piston will break it. # 1 = Budding amethyst will drop if you use a silk touch pickaxe. # 2 = Budding amethyst does not need silk touch, just a pickaxe. [range: 0 ~ 2, default: 0] @@ -137,7 +140,7 @@ generation { # Use a namespaced ID, + optionally meta (max 3) to choose the block that makes up fossils. The max meta is 3 because the rotations will change the meta. North/South is the meta + 4 and East/West is + 8. # Netherlicious bone block is "netherlicious:BoneBlock" and UpToDate bone block is "uptodate:bone_block". - # If the chosen block does not exist then fossils will not generate. If Netherlicious is installed, its bone block will be used if this is set to "etfutrum:bone_block" and Et Futurum Requiem bone blocks are disabled. [default: etfuturum:bone] + # If the chosen block does not exist then fossils will not generate. If Netherlicious is installed, its bone block will be used if this is set to "etfutrum:bone" and Et Futurum Requiem bone blocks are disabled. [default: etfuturum:bone] S:fossilBlockID=etfuturum:bone # The dimension IDs of the dimensions the fossil structures should not spawn in. Fossils will also not spawn in any dimension that is not an instance of WorldProviderSurface @@ -156,6 +159,10 @@ generation { # Max vein size for Granite/Andesite/Diorite blocks in a cluster [range: 0 ~ 64, default: 32] I:maxStonesPerCluster=32 + # The dimensions the deepslate layer (deepslate generation mode 0) should replace ALL stone in, rather than adhering to the deepslateMaxY limit. Does nothing if other deepslate generation modes are used. Useful if you have a mod that adds more "layers" to the overworld, for example. + I:replaceAllStoneWithDeepslateDimensionWhitelist < + > + # The max vein size for the first, typically smaller debris veins which generate from Y 8 to 119 [range: 0 ~ 64, default: 2] I:smallDebrisMax=2