alpha-test #3

Merged
raz merged 37 commits from alpha-test into master 2023-07-05 23:00:31 -05:00
4 changed files with 126 additions and 0 deletions
Showing only changes of commit 72a87e8c4d - Show all commits

View File

@ -1,3 +1,12 @@
# 1.0.17
## Config Changes
- Made the recipe for RFTool's Quarry Card much more expensive.
- Lowered the cost of Mekanism's Digital Miner.
- Disabled the ability to "pick up" blocks from Little Logistics.
- Fixed a bug with Canary and Little Logistics
# 1.0.16
## Config Changes

10
config/canary.properties Normal file
View File

@ -0,0 +1,10 @@
# This is the configuration file for Canary.
# This file exists for debugging purposes and should not be configured otherwise.
# Before configuring anything, take a backup of the worlds that will be opened.
#
# You can find information on editing this file and all the available options here:
# https://github.com/AbdElAziz333/Canary/wiki/Configuration-File
#
# By default, this file will be empty except for this notice.
mixin.block.hopper = false

View File

@ -0,0 +1,79 @@
[settings]
#General Settings
#Maximum distance from where Blocks and Entities can be picked up
#Range: 0.0 ~ 1.7976931348623157E308
maxDistance = 2.5
#Max width of entities that can be picked up in survival mode
#Range: 0.0 ~ 10.0
maxEntityWidth = 1.5
#Max height of entities that can be picked up in survival mode
#Range: 0.0 ~ 10.0
maxEntityHeight = 2.5
#Slowness multiplier for blocks
#Range: 0.0 ~ 1.7976931348623157E308
blockSlownessMultiplier = 1.0
#Slowness multiplier for entities
#Range: 0.0 ~ 1.7976931348623157E308
entitySlownessMultiplier = 1.0
#Maximum stack limit for entities
#Range: > 1
maxEntityStackLimit = 10
#More complex Tile Entities slow down the player more
heavyTiles = true
#Allow all blocks to be picked up, not just Tile Entites. White/Blacklist will still be respected.
pickupAllBlocks = false
#Whether Blocks and Entities slow the creative player down when carried
slownessInCreative = true
#Whether hostile mobs should be able to picked up in survival mode
pickupHostileMobs = false
#Larger Entities slow down the player more
heavyEntities = true
#Allow babies to be carried even when adult mob is blacklisted (or not whitelisted)
allowBabies = false
#Use Whitelist instead of Blacklist for Blocks
useWhitelistBlocks = false
#Use Whitelist instead of Blacklist for Entities
useWhitelistEntities = false
#Use Whitelist instead of Blacklist for Stacking
useWhitelistStacking = false
#Whether the player can hit blocks and entities while carrying or not
hitWhileCarrying = false
#Whether the player drops the carried object when hit or not
dropCarriedWhenHit = false
#Use custom Pickup Scripts. Having this set to false, will not allow you to run scripts, but will increase your performance
useScripts = false
#Allows entities to be stacked on top of each other
stackableEntities = true
#Whether entities' size matters when stacking or not. This means that larger entities cannot be stacked on smaller ones
entitySizeMattersStacking = true
#Usually all the block state information is retained when placing a block that was picked up. But some information is changed to a modified property, like rotation or orientation. In this list, add additional properties that should NOT be saved and instead be updated when placed. Format: modid:block[propertyname]. Note: You don't need to add an entry for every subtype of a same block. For example, we only add an entry for one type of slab, but the change is applied to all slabs.
placementStateExceptions = ["minecraft:chest[type]", "minecraft:stone_button[face]", "minecraft:vine[north,east,south,west,up]", "minecraft:creeper_head[rotation]", "minecraft:glow_lichen[north,east,south,west,up,down]", "minecraft:oak_sign[rotation]", "minecraft:oak_trapdoor[half]"]
#Whether Players can be picked up. Creative players can't be picked up in Survival Mode
pickupPlayers = true
[whitelist]
#Whitelist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config
#Entities that CAN be picked up (useWhitelistEntities must be true)
allowedEntities = []
#Blocks that CAN be picked up (useWhitelistBlocks must be true)
allowedBlocks = []
#Entities that CAN have other entities stacked on top of them (useWhitelistStacking must be true)
allowedStacking = []
[blacklist]
#Blacklist. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Black---and-Whitelist-Config
#Blocks that cannot be picked up
forbiddenTiles = ["#forge:immovable", "#forge:relocation_not_supported", "minecraft:end_portal", "minecraft:piston_head", "minecraft:end_gateway", "minecraft:tall_grass", "minecraft:large_fern", "minecraft:peony", "minecraft:rose_bush", "minecraft:lilac", "minecraft:sunflower", "minecraft:*_bed", "minecraft:*_door", "minecraft:big_dripleaf_stem", "minecraft:waterlily", "minecraft:cake", "minecraft:nether_portal", "minecraft:tall_seagrass", "animania:block_trough", "animania:block_invisiblock", "colossalchests:*", "ic2:*", "bigreactors:*", "forestry:*", "tconstruct:*", "rustic:*", "botania:*", "astralsorcery:*", "quark:colored_bed_*", "immersiveengineering:*", "embers:block_furnace", "embers:ember_bore", "embers:ember_activator", "embers:mixer", "embers:heat_coil", "embers:large_tank", "embers:crystal_cell", "embers:alchemy_pedestal", "embers:boiler", "embers:combustor", "embers:catalzyer", "embers:field_chart", "embers:inferno_forge", "storagedrawers:framingtable", "skyresources:*", "lootbags:*", "exsartagine:*", "aquamunda:tank", "opencomputers:*", "malisisdoors:*", "industrialforegoing:*", "minecolonies:*", "thaumcraft:pillar*", "thaumcraft:infernal_furnace", "thaumcraft:placeholder*", "thaumcraft:infusion_matrix", "thaumcraft:golem_builder", "thaumcraft:thaumatorium*", "magneticraft:oil_heater", "magneticraft:solar_panel", "magneticraft:steam_engine", "magneticraft:shelving_unit", "magneticraft:grinder", "magneticraft:sieve", "magneticraft:solar_tower", "magneticraft:solar_mirror", "magneticraft:container", "magneticraft:pumpjack", "magneticraft:solar_panel", "magneticraft:refinery", "magneticraft:oil_heater", "magneticraft:hydraulic_press", "magneticraft:multiblock_gap", "refinedstorage:*", "mcmultipart:*", "enderstorage:*", "betterstorage:*", "practicallogistics2:*", "wearablebackpacks:*", "rftools:screen", "rftools:creative_screen", "create:*", "magic_doorknob:*", "iceandfire:*", "ftbquests:*", "waystones:*", "contact:*", "framedblocks:*", "littlelogistics:*"]
#Entities that cannot be picked up
forbiddenEntities = ["minecraft:end_crystal", "minecraft:ender_dragon", "minecraft:ghast", "minecraft:shulker", "minecraft:leash_knot", "minecraft:armor_stand", "minecraft:item_frame", "minecraft:painting", "minecraft:shulker_bullet", "animania:hamster", "animania:ferret*", "animania:hedgehog*", "animania:cart", "animania:wagon", "mynko:*", "pixelmon:*", "mocreatures:*", "quark:totem", "vehicle:*"]
#Entities that cannot have other entities stacked on top of them
forbiddenStacking = ["minecraft:horse"]
[customPickupConditions]
#Custom Pickup Conditions. Read about the format here: https://github.com/Tschipp/CarryOn/wiki/Custom-Pickup-Condition-Config
#Custom Pickup Conditions for Blocks
customPickupConditionsBlocks = []
#Custom Pickup Conditions for Entities
customPickupConditionsEntities = []

View File

@ -0,0 +1,28 @@
// priority 2
// Attempting to balance our modpack by adding/removing or altering recipes
ServerEvents.recipes((event) => {
// Removing recipes that are being rebalanced
event.remove({ id: "rftoolsbuilder:shape_card_quarry" });
event.remove({ id: "mekanism:digital_miner" });
// RFTools Builder Quarry Card
event.shaped("rftoolsbuilder:shape_card_quarry", ["DPD", "ICI", "DSD"], {
D: "redstone_arsenal:flux_dust",
P: "redstone_arsenal:flux_pickaxe",
I: "redstone_arsenal:flux_plating",
C: "rftoolsbuilder:shape_card_def",
S: "redstone_arsenal:flux_shovel",
});
// Mekanism Digital Miner
event.shaped("mekanism:digital_miner", ["ACA", "SRS", "ETE"], {
A: "mekanism:alloy_atomic",
C: "mekanism:elite_control_circuit",
S: "mekanism:logistical_sorter",
R: "mekanism:advanced_control_circuit",
E: "minecraft:ender_pearl",
T: "mekanism:steel_casing",
});
});