diff --git a/Changelog.md b/Changelog.md index d8db952..575580b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -2,90 +2,32 @@ ## Additions -- Add cc-tweaked (1.16.4-1.95.2) -- Add JAVD (1.16.5-2.5.45) -- Add MoreMobGriefingOprions (1.16.5-1.0.0) -- Add OptiForge (1.16.5-0.5.0) -- Add Optifine (1.16.5-HD-U-G7-pre6) -- Add supermartijn642configlib (1.16-1.0.4) -- Add TinyMobFarm (1.16.3-1.1.1) -- Add TrackAPI (1.16.4-1.2.1) -- Add UniversalModCore (1.16.4-1.0.1) -- Add worldedit (1.16.3-7.2.2) +- Add Runelic (1.16.5-7.0.1) ## Removals -- Remove ars_nouveau -- Remove compact-crafting -- Remove compactmachines -- Remove DefaultOptions -- Remove fairylights -- Remove FarmersDelight -- Remove flatbedrock -- Remove item-filters -- Remove NetherPortalFix -- Remove ResourcefulBees - ## Updates -- Update achitectury (1.3.88 to 1.5.105) -- Update BetterBurning (1.16.5-6.0.1 to 1.16.5-6.0.2) -- Update BiomesOPlenty (1.16.4-13.0.0.430 to 1.16.4-13.0.0.431) -- Update BloodMagic (1.16.4-3.0.6-11 to 1.16.4-3.1.0-15) -- Update BotanyPots (1.16.5-7.0.1 to 1.16.5-7.0.2) -- Update CosmeticArmorReworked (1.16.5-v1 to 1.16.5-v1a) -- Update curios-forge (1.16.4-4.0.3.5 to 1.16.5-4.0.4.0) -- Update Cyclic (1.16.5-1.1.4 to 1.16.5-1.1.5) -- Update CyclopsCore (1.16.4-1.10.1 to 1.16.4-1.11.1) -- Update DarkUtilities (1.16.4-7.0.7 to 1.16.5-8.0.2) -- Update elevatorid (1.16.5-1.7.11 to 1.16.5-1.7.12) -- Update EnchantmentDescriptions (1.16.4-6.0.3 to 1.16.5-7.0.2) -- Update engineersdecor (1.16.4-1.1.6 to 1.16.4-1.1.7) -- Update engineerstools (1.16.4-1.1.3-b2 to 1.16.4-1.1.3) -- Update envirocore (1.16.4-3.0.6.0 to 1.16.5-3.0.7.0) -- Update enviroenergy (1.16.4-3.0.6.0 to 1.16.5-3.0.7.0) -- Update enviromats (1.16.4-2.0.6.0 to 1.16.5-2.0.7.0) -- Update envirotech (1.16.4-3.0.6.1 to 1.16.5-3.0.7.0) -- Update ExtraStorage (1.16.4-1.2.2 to 1.16.4-1.3.1) -- Update ftb-chunks (1604.2.2.61 to 1604.2.2.62) -- Update ftb-gui-library (1605.2.0.30 to 1605.2.1.37) -- Update ftb-teams (1604.1.0.14 to 1604.1.0.15) -- Update geckolib (1.16.5-3.0.2 to 1.16.5-3.0.11) -- Update gravestone (1.16.5-1.0.0 to 1.16.5-1.0.1) -- Update ImmersiveEngineering (1.16.4-4.1.2 to 1.16.5-4.2.1-131) -- Update industrial-foregoing (1.16.5-3.2.8.4 to 1.16.5-3.2.9.1) -- Update IntegratedDynamics (1.16.4-1.3.0 to 1.16.4-1.4.3) -- Update jei (1.16.4-7.6.1.65 to 1.16.4-7.6.1.66) -- Update kubejs (1605-3.4.151 to 1605-3.6.160) -- Update Lollipop (1.16.4-3.2.4 to 1.16.4-3.2.5) -- Update LostTrinkets (1.16.4-0.1.13 to 1.16.4-0.1.19) -- Update Mekanism (1.16.4-10.0.10.445 to 1.16.4-10.0.19.446) -- Update MekanismGenerators (1.16.4-10.0.10.445 to 1.16.4-10.0.19.446) -- Update MekanismTools (1.16.4-10.0.10.445 to 1.16.4-10.0.19.446) -- Update minecolonies (1.16.5-0.13.501 to 1.16.5-0.13.602) -- Update NaturesAura (33.4 to 34.0) -- Update NaturesCompas (1.16.4-1.86 to 1.16.5-1.8.6) -- Update pamhc2foodcore (1.16.3-1.0.1 to 1.16.3-1.0.2) -- Update pamhc2foodextended (1.16.3-1.0.0 to 1.16.3-1.0.1) -- Update pneumaticraft-repressurized (1.16.4-2.9.3-120 to 1.16.5-2.9.5-128) -- Update polymorph-forge (1.16.4-0.23 to 1.16.5-0.24) -- Update Powah (1.16.4-2.3.9 to 1.16.4-2.3.10) -- Update Quark (r2.4-297 to r2.4-303) -- Update rhino (1.7.13-10 to 1.7.13-14) -- Update rsgauges (1.16.4-1.2.7 to 1.16.4-1.2.8) -- Update simplemagnets (1.16.4-1.0.11 to 1.16.5-1.0.13) -- Update simplylights (1.16.4-1.1.1 to 1.16.4-1.1.2) -- Update snad (1.16.4-1.0.3 to 1.16.5-1.0.4) -- Update sophisticatedbackpacks (1.16.4-1.3.4.136 to 1.16.4-2.1.1.144) -- Update StorageDrawers (1.16.3-8.2.1 to 1.16.3-8.2.2) -- Update TerraForged (1.16.4-0.2.0-RC3 to 1.16.4-0.2.3) -- Update tetra (1.16.4-3.5.3 to 1.16.4-3.6.0) -- Update titanium (1.16.4-3.2.5 to 1.16.5-3.2.6.1) -- Update ToolStats (1.16.4-5.0.1 to 1.16.5-6.0.1) -- Update valkyrielib (1.16.4-3.0.6.1 to 1.16.5-3.0.7.0) +- Update achitectury (1.5.105 to 1.5.107) +- Update BotanyPots (1.16.5-7.0.2 to 1.16.5-7.0.6) +- Update Cyclic (1.16.5-1.1.5 to 1.16.5-1.1.6) +- Update dungeons_plus (1.16.4-1.1.2 to 1.16.4-1.1.3) +- Update engineerstools (1.16.4-1.1.3 to 1.16.4-1.1.4) +- Update envirocore (1.16.4-3.0.7.0 to 1.16.5-3.0.7.1) +- Update envirotech (1.16.4-3.0.7.0 to 1.16.5-3.0.7.1) +- Update ftb-gui-library (1605.2.1.37 to 1605.2.1.38) +- Update geckolib (1.16.5-3.0.11 to 1.16.5-3.0.12) +- Update industrial-foregoing (1.16.5-3.2.9.1 to 1.16.5-3.2.9.2) +- Update kubejs (1605-3.6.160 to 1605-3.6.162) +- Update mcjtylib (1.16-5.0.15 to 1.16-5.0.16) +- Update rftoolscontrol (1.16-4.0.6 to 1.16-4.0.7) +- Update rftoolsstorage (1.16-2.0.8 to 1.16-2.0.9) +- Update rftoolsutility (1.16-3.0.20 to 1.16-3.0.21) +- Update rsgauges (1.16.4-1.2.8 to 1.16.4-1.2.9-b1) +- Update titanium (1.16.4-3.2.6.1 to 1.16.5-3.2.6.2) +- Update trashcans (1.16.4-1.0.6a to 1.16.4-1.0.7) +- Update valkyrielib (1.16.4-3.0.7.0 to 1.16.5-3.0.7.1) ## Changes -- Change some config files -- Change some defaultcongigs -- Change kubejs recepies and worldge +- Change kubejs recepies and worldgen diff --git a/config/biomesoplenty/client.toml b/config/biomesoplenty/client.toml deleted file mode 100644 index f951577..0000000 --- a/config/biomesoplenty/client.toml +++ /dev/null @@ -1,6 +0,0 @@ - -#Client-related options. -[gui] - #Select the Biomes O' Plenty world type by default. - use_world_type = false - diff --git a/config/emendatusenigmatica-common.toml b/config/emendatusenigmatica-common.toml index fea7880..8137d77 100644 --- a/config/emendatusenigmatica-common.toml +++ b/config/emendatusenigmatica-common.toml @@ -21,7 +21,7 @@ ["Coal Config".Overworld] #Average Ores per Chunk [Default: 20] #Range: 0 ~ 64 - count = 20 + count = 15 #Configure the ore Vein Size [Default: 17] #Range: 0 ~ 64 vein_size = 17 @@ -979,7 +979,7 @@ #Range: 0 ~ 256 baseline = 100 #Activate/Deactivate the Ore Gen in The Overworld [Default: true] - generate_in_the_overworld = true + generate_in_the_overworld = false #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 60] #Range: 0 ~ 256 spread = 60 @@ -1079,7 +1079,7 @@ #Range: 0 ~ 256 baseline = 96 #Activate/Deactivate the Ore Gen in The Overworld [Default: true] - generate_in_the_overworld = true + generate_in_the_overworld = false #Spread Amount (# of Y-Levels above and below the Baseline) [Default: 32] #Range: 0 ~ 256 spread = 32 @@ -1305,13 +1305,13 @@ active = true ["Stratum Config: minecraft_andesite"] - active = false + active = true ["Stratum Config: minecraft_granite"] - active = false + active = true ["Stratum Config: minecraft_diorite"] - active = false + active = true ["Stratum Config: minecraft_sand"] active = false @@ -1320,7 +1320,7 @@ active = false ["Stratum Config: minecraft_netherrack"] - active = false + active = true ["Stratum Config: minecraft_blackstone"] active = false @@ -1329,26 +1329,22 @@ active = false ["Stratum Config: create_gabbro"] - active = false + active = true ["Stratum Config: create_limestone"] - active = false + active = true ["Stratum Config: create_scoria"] - active = false + active = true ["Stratum Config: create_weathered_limestone"] - active = false + active = true ["Stratum Config: quark_jasper"] - active = false + active = true ["Stratum Config: quark_marble"] - active = false + active = true ["Stratum Config: quark_slate"] - active = false - -["Stratum Config: byg_mossy_stone"] - active = false - + active = true \ No newline at end of file diff --git a/config/immersiveengineering-common.toml b/config/immersiveengineering-common.toml index 6c2de25..8a6c902 100644 --- a/config/immersiveengineering-common.toml +++ b/config/immersiveengineering-common.toml @@ -13,6 +13,7 @@ importantInfo = true #Setting any of these to false disables the respective compat [compat] crafttweaker = true + theoneprobe = true computercraft = true [debug] diff --git a/config/integrateddynamics-common.toml b/config/integrateddynamics-common.toml new file mode 100644 index 0000000..c8c0f64 --- /dev/null +++ b/config/integrateddynamics-common.toml @@ -0,0 +1,165 @@ + +[core] + + [core.general] + #If cable models should be cached for rendering optimization. + cacheCableModels = true + #How deep the recursion stack on an operator can become. This is to avoid game crashes when building things like the omega operator. + operatorRecursionLimit = 256 + #If the ingredient network observer can work on separate thread. + ingredientNetworkObserverEnableMultithreading = true + #The number of threads that the ingredient network observer can use. + ingredientNetworkObserverThreads = 4 + #The ingredient network observation frequency slowdown rate in ticks. + ingredientNetworkObserverFrequencyIncreaseFactor = 1 + #The frequency in ticks at which ingredient network should be observed after a position's contents are changed. + ingredientNetworkObserverFrequencyForced = 0 + #The fastest possible frequency in ticks at which ingredient network should be observed. + ingredientNetworkObserverFrequencyMin = 5 + #If an anonymous mod startup analytics request may be sent to our analytics service. + analytics = true + #When enabled, networks will stop ticking and values will not be shown and evaluated again. This can be used to fix crashing networks by temporarily enabling this option. + safeMode = false + #If the version checker should be enabled. + versionChecker = true + #The ingredient network observation frequency slowdown rate in ticks. + ingredientNetworkObserverFrequencyDecreaseFactor = 5 + #The slowest possible frequency in ticks at which ingredient network should be observed. + ingredientNetworkObserverFrequencyMax = 40 + #The maximum network energy transfer rate. + energyRateLimit = 2147483647 + #If network change events should be logged. Only enable this when debugging. + logChangeEvents = false + +[general] + + [general.general] + #The base energy usage for the world reader. + worldReaderBaseConsumption = 1 + #The base energy usage for the mono-directional connector. + connectorMonoDirectionalBaseConsumption = 32 + #The base energy usage for the entity writer. + entityWriterBaseConsumption = 1 + #The base energy usage for the redstone reader. + redstoneReaderBaseConsumption = 1 + #The base energy usage for the machine writer. + machineWriterBaseConsumption = 1 + #The base energy usage for the proxy. + proxyBaseConsumption = 2 + #The base energy usage for the materializer. + materializerBaseConsumption = 1 + #The base energy usage for the fluid reader. + fluidReaderBaseConsumption = 1 + #The base energy usage for the display panel when does not have a variable. + panelDisplayBaseConsumptionDisabled = 1 + #The base energy usage for the extra-dimensional reader. + extraDimensionalReaderBaseConsumption = 1 + #The maximum render distance for part overlays to render. The higher, the more resource intensive. + partOverlayRenderdistance = 15 + #The base energy usage for the machine reader. + machineReaderBaseConsumption = 1 + #The base energy usage for the network reader. + networkReaderBaseConsumption = 1 + #The base energy usage for the static light panel. + panelLightStaticBaseConsumption = 0 + #The base energy usage for the block reader. + blockReaderBaseConsumption = 1 + #The base energy usage for the dynamic light panel. + panelLightDynamicBaseConsumption = 0 + #The base energy usage for the variable store. + variablestoreBaseConsumption = 4 + #The base energy usage for the audio writer. + audioWriterBaseConsumption = 1 + #The base energy usage for the redstone writer. + redstoneWriterBaseConsumption = 1 + #The base energy usage for the effect writer. + effectWriterBaseConsumption = 1 + #The base energy usage for the omni-directional connector. + connectorOmniDirectionalBaseConsumption = 128 + #The energy usage multiplier for networks. + energyConsumptionMultiplier = 0 + #The base energy usage for the audio reader. + audioReaderBaseConsumption = 1 + #The base energy usage for the inventory reader. + inventoryReaderBaseConsumption = 1 + #The base energy usage for the inventory writer. + inventoryWriterBaseConsumption = 1 + #The base energy usage for the display panel when it has a variable. + panelDisplayBaseConsumptionEnabled = 2 + #The base energy usage for the entity reader. + entityReaderBaseConsumption = 1 + +[machine] + + [machine.general] + #Priority list of mod id's when determining tag-based recipe outputs. + recipeTagOutputModPriorities = ["emendatusenigmatica", "minecraft", "immersiveengineering", "thermal", "create", "mekanism", "kubejs", "appliedenergistics2", "pneumaticcraft", "industrialforegoing", "quark"] + #The default update frequency in ticks to use for new parts. + defaultPartUpdateFreq = 1 + #The NBT tags that are not allowed to be read by displaying NBT tags or performing operations on them. + nbtTagBlacklist = [] + #The maximum offset in blocks a directional connector can look for its target. + maxDirectionalConnectorOffset = 512 + + [machine.delay] + #The maximum value history length that can be maintained.. + maxHistoryCapacity = 1024 + + [machine.mechanical_squeezer] + #The energy consumption rate. + consumptionRate = 80 + #How many mB per tick can be auto-ejected. + autoEjectFluidRate = 500 + #The energy capacity of a mechanical squeezer. + capacity = 100000 + + [machine.mechanical_drying_basin] + #The energy consumption rate. + consumptionRate = 80 + #The energy capacity of a mechanical drying basin. + capacity = 100000 + + [machine.energy_battery] + #The 1/X fraction of the battery capacity that is allowed to be transfered per tick. + energyRateCapacityFraction = 2000 + #The minimum energy transfer rate per tick. + minEnergyRate = 2000 + #The maximum capacity shown in creative tabs. (Make sure that you do not cross the max int size) + maxCreativeTabCapacity = 655360000 + #The maximum capacity visible in the creative tabs. (Make sure that you do not cross the max int size) + maxCreativeCapacity = 40960000 + #The default capacity of an energy battery. + capacity = 1000000 + + [machine.invisible_light] + #If invisible light should act as full a block + invisibleLightBlock = true + +[worldgeneration] + + [worldgeneration.meneglin] + #The chance at which a Menril Tree will spawn in the wild, the higher this value, the lower the chance. + wildMenrilTreeChance = 100 + + [worldgeneration.menril_log_filled] + #The 1/x chance at which Menril Wood will be filled with Menril Resin when generated, the higher this value, the lower the chance. + filledMenrilLogChance = 10 + +[item] + + [item.on_the_dynamics_of_integration] + #If the info book should automatically obtained when the player first spawns. + obtainOnSpawn = true + #If the info book can give item rewards for tutorial completion. + bookRewards = true + + [item.menril_berries] + #If the berries should give the night vision effect when eaten. + nightVision = true + +[biome] + + [biome.meneglin] + #The weight of spawning in the overworld, 0 disables spawning. + spawnWeight = 5 + diff --git a/config/jei-client.toml b/config/jei-client.toml deleted file mode 100644 index 963cc25..0000000 --- a/config/jei-client.toml +++ /dev/null @@ -1,55 +0,0 @@ - -[advanced] - #How items should be handed to you - #Allowed Values: INVENTORY, MOUSE_PICKUP - GiveMode = "INVENTORY" - #Debug mode enabled - DebugMode = false - #Display search bar in the center - CenterSearch = false - #Max. recipe gui height - #Range: > 175 - RecipeGuiHeight = 350 - #Set low-memory mode (makes search very slow, but uses less RAM) - LowMemorySlowSearchEnabled = false - #Max number of columns shown - #Range: 4 ~ 100 - MaxColumns = 100 - -[colors] - #Color values to search for - SearchColors = ["White:EEEEEE", "LightBlue:7492cc", "Cyan:00EEEE", "Blue:2222dd", "LapisBlue:25418b", "Teal:008080", "Yellow:cacb58", "GoldenYellow:EED700", "Orange:d97634", "Pink:D1899D", "HotPink:FC0FC0", "Magenta:b24bbb", "Purple:813eb9", "JadedPurple:43324f", "EvilPurple:2e1649", "Lavender:B57EDC", "Indigo:480082", "Sand:dbd3a0", "Tan:bb9b63", "LightBrown:A0522D", "Brown:634b33", "DarkBrown:3a2d13", "LimeGreen:43b239", "SlimeGreen:83cb73", "Green:008000", "DarkGreen:224d22", "GrassGreen:548049", "Red:963430", "BrickRed:b0604b", "NetherBrick:2a1516", "Redstone:ce3e36", "Black:181515", "CharcoalGray:464646", "IronGray:646464", "Gray:808080", "Silver:C0C0C0"] - -[sorting] - #Sorting order for the ingredient list. Valid stages: [MOD_NAME, INGREDIENT_TYPE, ALPHABETICAL, CREATIVE_MENU] - IngredientSortStages = ["MOD_NAME", "INGREDIENT_TYPE", "CREATIVE_MENU"] - -[search] - #Search mode for Mod Names (prefix: @) - #Allowed Values: ENABLED, REQUIRE_PREFIX, DISABLED - ModNameSearchMode = "REQUIRE_PREFIX" - #Search mode for Tag Names (prefix: $) - #Allowed Values: ENABLED, REQUIRE_PREFIX, DISABLED - TagSearchMode = "REQUIRE_PREFIX" - #Search mode for Creative Tab Names (prefix: %) - #Allowed Values: ENABLED, REQUIRE_PREFIX, DISABLED - CreativeTabSearchMode = "DISABLED" - #Search mode for Colors (prefix: ^) - #Allowed Values: ENABLED, REQUIRE_PREFIX, DISABLED - ColorSearchMode = "DISABLED" - #Search mode for resources IDs (prefix: &) - #Allowed Values: ENABLED, REQUIRE_PREFIX, DISABLED - ResourceIdSearchMode = "DISABLED" - #Search mode for Tooltips (prefix: #) - #Allowed Values: ENABLED, REQUIRE_PREFIX, DISABLED - TooltipSearchMode = "ENABLED" - #Search advanced tooltips (visible with F3+H) - SearchAdvancedTooltips = false - -[modname] - #Formatting for mod name tooltip - #Use these formatting keys: - #black, dark_blue, dark_green, dark_aqua, dark_red, dark_purple, gold, gray, dark_gray, blue, green, aqua, red, light_purple, yellow, white - #obfuscated, bold, strikethrough, underline, italic - ModNameFormat = "blue italic" - diff --git a/config/losttrinkets/general_common.toml b/config/losttrinkets/general_common.toml index 62cee27..9a2ddfc 100644 --- a/config/losttrinkets/general_common.toml +++ b/config/losttrinkets/general_common.toml @@ -14,6 +14,9 @@ nonRandom = ["losttrinkets:rock_candy", "losttrinkets:tha_cloud", "losttrinkets: #Amount of Xp levels added to the next unlocking cost. #Range: 0 ~ 20 slotUpFactor = 5 + #Maximum number of trinket slots the player can have (does not remove unlocked slots) + #Range: 1 ~ 40 + maxSlots = 40 #Numbers of trinket slots the player will start with (Only effect newer players!!). #Range: 0 ~ 40 startSlots = 1 diff --git a/config/pneumaticcraft/ArmorFeatureStatus.cfg b/config/pneumaticcraft/ArmorFeatureStatus.cfg new file mode 100644 index 0000000..4589b05 --- /dev/null +++ b/config/pneumaticcraft/ArmorFeatureStatus.cfg @@ -0,0 +1,6 @@ +{ + "description": "Tracks the active upgrades for the Pneumatic Armor (clientside)", + "active": [ + "pneumaticcraft:core_components" + ] +} \ No newline at end of file diff --git a/config/pneumaticcraft/MicromissileDefaults.cfg b/config/pneumaticcraft/MicromissileDefaults.cfg new file mode 100644 index 0000000..87e83ca --- /dev/null +++ b/config/pneumaticcraft/MicromissileDefaults.cfg @@ -0,0 +1,4 @@ +{ + "Description": "Stores default Micromissile settings on a per-player basis", + "defaults": {} +} \ No newline at end of file diff --git a/config/pneumaticcraft/PneumaticArmorHUDLayout.cfg b/config/pneumaticcraft/PneumaticArmorHUDLayout.cfg new file mode 100644 index 0000000..6e0efac --- /dev/null +++ b/config/pneumaticcraft/PneumaticArmorHUDLayout.cfg @@ -0,0 +1,40 @@ +{ + "Description": "Stores the layout of Pneumatic Armor HUD elements", + "stats": { + "power": { + "x": 0.995, + "y": 0.005, + "leftSided": true + }, + "message": { + "x": 0.005, + "y": 0.15, + "leftSided": false + }, + "blockTracker": { + "x": 0.995, + "y": 0.1, + "leftSided": true + }, + "entityTracker": { + "x": 0.995, + "y": 0.2, + "leftSided": true + }, + "itemSearch": { + "x": 0.005, + "y": 0.1, + "leftSided": false + }, + "airCon": { + "x": 0.5, + "y": 0.005, + "leftSided": false + }, + "jetBoots": { + "x": 0.7, + "y": 0.005, + "leftSided": true + } + } +} \ No newline at end of file diff --git a/config/pneumaticcraft/ProgrammingPuzzleBlacklist.cfg b/config/pneumaticcraft/ProgrammingPuzzleBlacklist.cfg new file mode 100644 index 0000000..fcfee46 --- /dev/null +++ b/config/pneumaticcraft/ProgrammingPuzzleBlacklist.cfg @@ -0,0 +1,64 @@ +{ + "description": "In the \u0027blacklist\u0027 tag you can add any progwidget registry names you wish to blacklist from this instance. When they were used in existing programs already they will be deleted. A reference list of all known programming puzzle names can be seen in \u0027allWidgets\u0027.", + "blacklist": [], + "allWidgets": [ + "pneumaticcraft:comment", + "pneumaticcraft:start", + "pneumaticcraft:area", + "pneumaticcraft:text", + "pneumaticcraft:item_filter", + "pneumaticcraft:item_assign", + "pneumaticcraft:liquid_filter", + "pneumaticcraft:coordinate", + "pneumaticcraft:coordinate_operator", + "pneumaticcraft:entity_attack", + "pneumaticcraft:dig", + "pneumaticcraft:harvest", + "pneumaticcraft:place", + "pneumaticcraft:block_right_click", + "pneumaticcraft:entity_right_click", + "pneumaticcraft:pickup_item", + "pneumaticcraft:drop_item", + "pneumaticcraft:void_item", + "pneumaticcraft:void_liquid", + "pneumaticcraft:inventory_export", + "pneumaticcraft:inventory_import", + "pneumaticcraft:liquid_export", + "pneumaticcraft:liquid_import", + "pneumaticcraft:entity_export", + "pneumaticcraft:entity_import", + "pneumaticcraft:rf_import", + "pneumaticcraft:rf_export", + "pneumaticcraft:goto", + "pneumaticcraft:teleport", + "pneumaticcraft:emit_redstone", + "pneumaticcraft:label", + "pneumaticcraft:jump", + "pneumaticcraft:wait", + "pneumaticcraft:rename", + "pneumaticcraft:suicide", + "pneumaticcraft:external_program", + "pneumaticcraft:crafting", + "pneumaticcraft:standby", + "pneumaticcraft:logistics", + "pneumaticcraft:for_each_coordinate", + "pneumaticcraft:for_each_item", + "pneumaticcraft:edit_sign", + "pneumaticcraft:condition_coordinate", + "pneumaticcraft:condition_redstone", + "pneumaticcraft:condition_light", + "pneumaticcraft:condition_item_inventory", + "pneumaticcraft:condition_block", + "pneumaticcraft:condition_liquid_inventory", + "pneumaticcraft:condition_entity", + "pneumaticcraft:condition_pressure", + "pneumaticcraft:condition_item", + "pneumaticcraft:drone_condition_item", + "pneumaticcraft:drone_condition_liquid", + "pneumaticcraft:drone_condition_entity", + "pneumaticcraft:drone_condition_pressure", + "pneumaticcraft:condition_rf", + "pneumaticcraft:drone_condition_rf", + "pneumaticcraft:computer_control" + ] +} \ No newline at end of file diff --git a/config/pneumaticcraft/thirdparty.cfg b/config/pneumaticcraft/thirdparty.cfg new file mode 100644 index 0000000..eff1f95 --- /dev/null +++ b/config/pneumaticcraft/thirdparty.cfg @@ -0,0 +1,15 @@ +{ + "description": "Enable/disable integration of specific third-party mods", + "enabled_mods": { + "botania": false, + "theoneprobe": true, + "mekanism": true, + "immersiveengineering": true, + "curios": true, + "patchouli": true, + "computercraft": true, + "waila": true, + "appliedenergistics2": true, + "jei": true + } +} \ No newline at end of file diff --git a/config/quark-common.toml b/config/quark-common.toml index bf57f7c..31e4e15 100644 --- a/config/quark-common.toml +++ b/config/quark-common.toml @@ -381,6 +381,7 @@ "Double Door Opening" = true "Automatic Recipe Unlock" = true "Poison Potato Usage" = true + "Lava Bucket As Trash" = true "Improved Sleeping" = true "Infinity Bucket" = true "Springy Slime" = true @@ -1728,38 +1729,9 @@ Crabs = true Stonelings = true Foxhound = true - Toretoise = true Forgotten = true Wraith = true - - [mobs.stonelings] - "Cautious Stonelings" = true - "Enable Diamond Heart" = true - "Max Y Level" = 24 - "Tamable Stonelings" = true - - [mobs.stonelings.spawn_config] - # - #Allowed values: (0,) - "Spawn Weight" = 80 - # - #Allowed values: [1,) - "Min Group Size" = 1 - # - #Allowed values: [1,) - "Max Group Size" = 1 - - [mobs.stonelings.spawn_config.biomes] - # - #Allowed values: [[none, taiga, extreme_hills, jungle, mesa, plains, savanna, - # icy, the_end, beach, forest, ocean, desert, river, swamp, - # mushroom, nether] - "Biome Categories" = ["none", "nether", "the_end"] - "Is Blacklist" = true - - [mobs.stonelings.dimensions] - Dimensions = ["minecraft:overworld"] - "Is Blacklist" = false + Toretoise = true [mobs.toretoise] "Max Y Level" = 32 @@ -1846,6 +1818,64 @@ Biomes = ["minecraft:nether_wastes", "minecraft:basalt_deltas"] "Is Blacklist" = false + [mobs.wraith] + # + #List of sound sets to use with wraiths. + #Three sounds must be provided per entry, separated by | (in the format idle|hurt|death). Leave blank for no sound (i.e. if a mob has no ambient noise) + "Wraith Sounds" = ["entity.sheep.ambient|entity.sheep.hurt|entity.sheep.death", "entity.cow.ambient|entity.cow.hurt|entity.cow.death", "entity.pig.ambient|entity.pig.hurt|entity.pig.death", "entity.chicken.ambient|entity.chicken.hurt|entity.chicken.death", "entity.horse.ambient|entity.horse.hurt|entity.horse.death", "entity.cat.ambient|entity.cat.hurt|entity.cat.death", "entity.wolf.ambient|entity.wolf.hurt|entity.wolf.death", "entity.villager.ambient|entity.villager.hurt|entity.villager.death", "entity.polar_bear.ambient|entity.polar_bear.hurt|entity.polar_bear.death", "entity.zombie.ambient|entity.zombie.hurt|entity.zombie.death", "entity.skeleton.ambient|entity.skeleton.hurt|entity.skeleton.death", "entity.spider.ambient|entity.spider.hurt|entity.spider.death", "|entity.creeper.hurt|entity.creeper.death", "entity.endermen.ambient|entity.endermen.hurt|entity.endermen.death", "entity.zombie_pig.ambient|entity.zombie_pig.hurt|entity.zombie_pig.death", "entity.witch.ambient|entity.witch.hurt|entity.witch.death", "entity.blaze.ambient|entity.blaze.hurt|entity.blaze.death", "entity.llama.ambient|entity.llama.hurt|entity.llama.death", "|quark:entity.stoneling.cry|quark:entity.stoneling.die", "quark:entity.frog.idle|quark:entity.frog.hurt|quark:entity.frog.die"] + + [mobs.wraith.spawn_config] + # + #Allowed values: (0,) + "Spawn Weight" = 8 + "Max Cost" = 0.7 + # + #Allowed values: [1,) + "Min Group Size" = 1 + "Spawn Cost" = 0.15 + # + #Allowed values: [1,) + "Max Group Size" = 3 + + [mobs.wraith.spawn_config.biomes] + Biomes = ["minecraft:soul_sand_valley"] + "Is Blacklist" = false + + [mobs.stonelings] + "Cautious Stonelings" = true + "Enable Diamond Heart" = true + "Max Y Level" = 24 + "Tamable Stonelings" = true + + [mobs.stonelings.spawn_config] + # + #Allowed values: (0,) + "Spawn Weight" = 80 + # + #Allowed values: [1,) + "Min Group Size" = 1 + # + #Allowed values: [1,) + "Max Group Size" = 1 + + [mobs.stonelings.spawn_config.biomes] + # + #Allowed values: [[none, taiga, extreme_hills, jungle, mesa, plains, savanna, + # icy, the_end, beach, forest, ocean, desert, river, swamp, + # mushroom, nether] + "Biome Categories" = ["none", "nether", "the_end"] + "Is Blacklist" = true + + [mobs.stonelings.dimensions] + Dimensions = ["minecraft:overworld"] + "Is Blacklist" = false + + [mobs.forgotten] + # + #1 in this many Skeletons that spawn under the threshold are replaced with Forgotten. + "Forgotten Spawn Rate" = 0.05 + "Max Height For Spawn" = 20 + [mobs.frogs] "Enable Brewing" = true "Enable Big Funny" = false @@ -1869,35 +1899,6 @@ "Biome Categories" = ["swamp"] "Is Blacklist" = false - [mobs.forgotten] - # - #1 in this many Skeletons that spawn under the threshold are replaced with Forgotten. - "Forgotten Spawn Rate" = 0.05 - "Max Height For Spawn" = 20 - - [mobs.wraith] - # - #List of sound sets to use with wraiths. - #Three sounds must be provided per entry, separated by | (in the format idle|hurt|death). Leave blank for no sound (i.e. if a mob has no ambient noise) - "Wraith Sounds" = ["entity.sheep.ambient|entity.sheep.hurt|entity.sheep.death", "entity.cow.ambient|entity.cow.hurt|entity.cow.death", "entity.pig.ambient|entity.pig.hurt|entity.pig.death", "entity.chicken.ambient|entity.chicken.hurt|entity.chicken.death", "entity.horse.ambient|entity.horse.hurt|entity.horse.death", "entity.cat.ambient|entity.cat.hurt|entity.cat.death", "entity.wolf.ambient|entity.wolf.hurt|entity.wolf.death", "entity.villager.ambient|entity.villager.hurt|entity.villager.death", "entity.polar_bear.ambient|entity.polar_bear.hurt|entity.polar_bear.death", "entity.zombie.ambient|entity.zombie.hurt|entity.zombie.death", "entity.skeleton.ambient|entity.skeleton.hurt|entity.skeleton.death", "entity.spider.ambient|entity.spider.hurt|entity.spider.death", "|entity.creeper.hurt|entity.creeper.death", "entity.endermen.ambient|entity.endermen.hurt|entity.endermen.death", "entity.zombie_pig.ambient|entity.zombie_pig.hurt|entity.zombie_pig.death", "entity.witch.ambient|entity.witch.hurt|entity.witch.death", "entity.blaze.ambient|entity.blaze.hurt|entity.blaze.death", "entity.llama.ambient|entity.llama.hurt|entity.llama.death", "|quark:entity.stoneling.cry|quark:entity.stoneling.die", "quark:entity.frog.idle|quark:entity.frog.hurt|quark:entity.frog.die"] - - [mobs.wraith.spawn_config] - "Max Cost" = 0.7 - "Spawn Cost" = 0.15 - # - #Allowed values: (0,) - "Spawn Weight" = 8 - # - #Allowed values: [1,) - "Min Group Size" = 1 - # - #Allowed values: [1,) - "Max Group Size" = 3 - - [mobs.wraith.spawn_config.biomes] - Biomes = ["minecraft:soul_sand_valley"] - "Is Blacklist" = false - [client] "Greener Grass" = true "Variant Animal Textures" = true diff --git a/config/simplemagnets-common.toml b/config/simplemagnets-common.toml index e994e91..db5237c 100644 --- a/config/simplemagnets-common.toml +++ b/config/simplemagnets-common.toml @@ -1,21 +1,21 @@ +[General] + #In what range should the Basic Magnet pickup items and xp? + #Range: 1 ~ 20 + basicMagnetRange = 5 + #What is the minimum range of the Advanced Magnet? + #Range: 1 ~ 20 + advancedMagnetMinRange = 3 + #What is the maximum range of the Advanced Magnet? + #Range: 1 ~ 20 + advancedMagnetMaxRange = 11 + #In what range should the Basic Magnet pickup items and xp by default? + #Range: 1 ~ 10 + advancedMagnetRange = 8 + [Client] #Should the magnet play a ding sound when turned on or off? playToggleSound = true #Should the magnet display a message on screen when turned on or off? showToggleMessage = false -[General] - #In what range should the Basic Magnet pickup items and xp? - #Range: 1 ~ 20 - basicMagnetRange = 5 - #In what range should the Basic Magnet pickup items and xp by default? - #Range: 1 ~ 10 - advancedMagnetRange = 8 - #What is the minimum range of the Advanced Magnet? - #Range: 1 ~ 20 - advancedMagnetMinRange = 3 - #What is the maximum range of the Advanced Magnet? - #Range: 1 ~ 20 - advancedMagnetMaxRange = 11 - diff --git a/fellies-modpack.code-workspace b/fellies-modpack.code-workspace deleted file mode 100644 index 022c3e5..0000000 --- a/fellies-modpack.code-workspace +++ /dev/null @@ -1,8 +0,0 @@ -{ - "folders": [ - { - "path": "." - } - ], - "settings": {} -} diff --git a/kubejs/assets/kubejs/textures/blocks/aluminum_ore_deposit.png b/kubejs/assets/kubejs/textures/block/aluminum_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/aluminum_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/aluminum_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/coal_ore_deposit.png b/kubejs/assets/kubejs/textures/block/coal_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/coal_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/coal_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/copper_ore_deposit.png b/kubejs/assets/kubejs/textures/block/copper_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/copper_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/copper_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/diamond_ore_deposit.png b/kubejs/assets/kubejs/textures/block/diamond_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/diamond_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/diamond_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/emerald_ore_deposit.png b/kubejs/assets/kubejs/textures/block/emerald_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/emerald_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/emerald_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/gold_ore_deposit.png b/kubejs/assets/kubejs/textures/block/gold_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/gold_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/gold_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/iron_ore_deposit.png b/kubejs/assets/kubejs/textures/block/iron_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/iron_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/iron_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/lapis_ore_deposit.png b/kubejs/assets/kubejs/textures/block/lapis_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/lapis_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/lapis_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/lead_ore_deposit.png b/kubejs/assets/kubejs/textures/block/lead_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/lead_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/lead_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/nickel_ore_deposit.png b/kubejs/assets/kubejs/textures/block/nickel_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/nickel_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/nickel_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/redstone_ore_deposit.png b/kubejs/assets/kubejs/textures/block/redstone_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/redstone_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/redstone_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/silver_ore_deposit.png b/kubejs/assets/kubejs/textures/block/silver_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/silver_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/silver_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/tin_ore_deposit.png b/kubejs/assets/kubejs/textures/block/tin_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/tin_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/tin_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/blocks/uranium_ore_deposit.png b/kubejs/assets/kubejs/textures/block/uranium_ore_deposit.png similarity index 100% rename from kubejs/assets/kubejs/textures/blocks/uranium_ore_deposit.png rename to kubejs/assets/kubejs/textures/block/uranium_ore_deposit.png diff --git a/kubejs/assets/kubejs/textures/item/diamond_nugget.png b/kubejs/assets/kubejs/textures/item/diamond_nugget.png new file mode 100644 index 0000000..99594cf Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/diamond_nugget.png differ diff --git a/kubejs/assets/kubejs/textures/item/graphite_one.png b/kubejs/assets/kubejs/textures/item/graphite_one.png new file mode 100644 index 0000000..bc7ee2b Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/graphite_one.png differ diff --git a/kubejs/assets/kubejs/textures/item/graphite_three.png b/kubejs/assets/kubejs/textures/item/graphite_three.png new file mode 100644 index 0000000..cf53f0b Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/graphite_three.png differ diff --git a/kubejs/assets/kubejs/textures/item/graphite_two.png b/kubejs/assets/kubejs/textures/item/graphite_two.png new file mode 100644 index 0000000..4b1b086 Binary files /dev/null and b/kubejs/assets/kubejs/textures/item/graphite_two.png differ diff --git a/kubejs/server_scripts/fellies/kubejs/globals.js b/kubejs/server_scripts/fellies/kubejs/globals.js index debab06..d10fa68 100644 --- a/kubejs/server_scripts/fellies/kubejs/globals.js +++ b/kubejs/server_scripts/fellies/kubejs/globals.js @@ -72,7 +72,6 @@ const modPriorities = [ 'immersiveengineering', 'thermal', 'mekanism', - 'jaopca', 'kubejs', 'pneumaticcraft', 'create', @@ -80,7 +79,6 @@ const modPriorities = [ 'quark', 'refinedstorage', 'bloodmagic', - 'morevanillalib', 'titanium' ]; diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/blasting.js b/kubejs/server_scripts/fellies/kubejs/recipes/blasting.js deleted file mode 100644 index 9b42cec..0000000 --- a/kubejs/server_scripts/fellies/kubejs/recipes/blasting.js +++ /dev/null @@ -1,4 +0,0 @@ -events.listen('recipes', (event) => { - // Mana and artifice - // event.blasting('mana-and-artifice:vinteum_dust', 'emendatusenigmatica:arcane_ore'); -}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/bloodmagic/bloodmagic.js b/kubejs/server_scripts/fellies/kubejs/recipes/bloodmagic/bloodmagic.js new file mode 100644 index 0000000..74e944d --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/bloodmagic/bloodmagic.js @@ -0,0 +1,14 @@ +// priority: 99 + +/* + * Supported types: + * altar, array, soulforge, arc, alchemytable + * + * Url: https://www.curseforge.com/minecraft/mc-mods/kubejs-blood-magic + */ + +events.listen('recipes', e => { + const { + altar, array, soulforge, arc, alchemytable + } = e.recipes.bloodmagic; +}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/create/create.js b/kubejs/server_scripts/fellies/kubejs/recipes/create/create.js new file mode 100644 index 0000000..4a50aac --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/create/create.js @@ -0,0 +1,22 @@ +// priority: 99 + +/* + * Supported types: + * conversion, crushing, cutting, milling, basin, mixing, compacting, + * pressing, sandpaper_polishing, splashing, filling, emptying, mechanical_crafting + * + * Notes: + * mixing and compacting supports .heated() and .superheated() + * mechanical_crafting correlates to vanilla shaped crafting + * + * Url: https://www.curseforge.com/minecraft/mc-mods/kubejs-create + */ + +events.listen('recipes', e => { + const { + conversion, crushing, cutting, milling, basin, mixing, compacting, + pressing, sandpaper_polishing, splashing, filling, emptying, mechanical_crafting + } = e.recipes.create; + + pressing(Item.of('#forge:storage_blocks/coal', 9), 'kubejs:graphite_one'); +}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/ie/immersive_engineering.js b/kubejs/server_scripts/fellies/kubejs/recipes/ie/immersive_engineering.js new file mode 100644 index 0000000..b439dde --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/ie/immersive_engineering.js @@ -0,0 +1,16 @@ +// priority: 99 + +/* + * Supported types: + * alloy, blast_furnace, blast_furnace_fuel, coke_oven, cloche, fertilizer, + * metal_press, arc_furnace, crusher, sawmill + * + * Url: https://www.curseforge.com/minecraft/mc-mods/kubejs-immersive-engineering + */ + +events.listen('recipes', e => { + const { + alloy, blast_furnace, blast_furnace_fuel, coke_oven, cloche, fertilizer, + metal_press, arc_furnace, crusher, sawmill + } = e.recipes.immersiveengineering; +}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/mekanism/mekanism.js b/kubejs/server_scripts/fellies/kubejs/recipes/mekanism/mekanism.js new file mode 100644 index 0000000..2e81fbf --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/mekanism/mekanism.js @@ -0,0 +1,15 @@ +// priority: 99 + +/* + * Supported types: + * crushing, enriching, smelting, combining, compressing, purifying, injecting, + * metallurgic_infusing, sawing + * + * Url: https://www.curseforge.com/minecraft/mc-mods/kubejs-mekanism + */ + +events.listen('recipes', e => { + const { + crushing, enriching, smelting, combining, compressing, purifying, injecting, metallurgic_infusing, sawing + } = e.recipes.mekanism; +}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/blasting.js b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/blasting.js new file mode 100644 index 0000000..add3e36 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/blasting.js @@ -0,0 +1,4 @@ +// priority: 99 + +events.listen('recipes', e => { +}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shaped.js b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shaped.js new file mode 100644 index 0000000..a2b13a3 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shaped.js @@ -0,0 +1,41 @@ +// priority: 99 + +events.listen('recipes', e => { + // Minecraft + e.shaped(Item.of('minecraft:stick', 16), ['A', 'A'], { + A: '#minecraft:logs' + }); + e.shaped('minecraft:hopper', ['ABA', 'ABA', ' A '], { + A: '#forge:ingots/iron', + B: '#minecraft:logs' + }); + e.shaped('minecraft:furnace', ['LLL', 'L L', 'LLL'], { + L: '#forge:stone' + }); + + // Xreliquary + e.shaped(Item.of('minecraft:glowstone_dust', 6), [ + 'H ', + ' H ', + ' H' + ], { + H: 'xreliquary:witch_hat' + }); + + e.shaped(Item.of('minecraft:gunpowder', 6), [ + ' H ', + ' H ', + ' H ' + ], { + H: 'xreliquary:witch_hat' + }); + + e.shaped(Item.of('minecraft:redstone', 6), [ + 'H ', + ' H ', + 'H ' + ], { + H: 'xreliquary:witch_hat' + }); +}); + diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shapeless.js b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shapeless.js new file mode 100644 index 0000000..83df8a5 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/shapeless.js @@ -0,0 +1,20 @@ +events.listen('recipes', e => { + // Additional Lights + e.shapeless('additional_lights:fire_for_standing_torch_s', ['#fellies:minicoal']); + e.shapeless('additional_lights:fire_for_standing_torch_l', ['#fellies:minicoal', '#fellies:minicoal']); + e.shapeless('additional_lights:fire_for_fire_pit_s', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal']); + e.shapeless('additional_lights:fire_for_fire_pit_l', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal','#fellies:minicoal']); + e.shapeless('additional_lights:soul_fire_for_standing_torch_s', ['#fellies:minicoal', '#forge:soul_sand']); + e.shapeless('additional_lights:soul_fire_for_standing_torch_l', ['#fellies:minicoal', '#fellies:minicoal', '#forge:soul_sand']); + e.shapeless('additional_lights:soul_fire_for_fire_pit_s', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']); + e.shapeless('additional_lights:soul_fire_for_fire_pit_l', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']); + + // Minecraft + e.shapeless('minecraft:sticky_piston', ['minecraft:piston', '#forge:slimeballs']); + e.shapeless('minecraft:flint', ['#forge:gravel', '#forge:gravel', '#forge:gravel']); + e.shapeless('minecraft:chest', ['#forge:chests/wooden']); + e.shapeless('minecraft:wheat_seeds', ['minecraft:wheat']); + + // RF Tools + e.shapeless('rftoolsbase:dimensionalshard', ['emendatusenigmatica:dimensional_gem']); +}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/smelting.js b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/smelting.js new file mode 100644 index 0000000..add3e36 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/smelting.js @@ -0,0 +1,4 @@ +// priority: 99 + +events.listen('recipes', e => { +}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/stonecutting.js b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/stonecutting.js new file mode 100644 index 0000000..add3e36 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/minecraft/stonecutting.js @@ -0,0 +1,4 @@ +// priority: 99 + +events.listen('recipes', e => { +}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/remove.js b/kubejs/server_scripts/fellies/kubejs/recipes/remove.js index af68464..f9ccf98 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/remove.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/remove.js @@ -1,83 +1,82 @@ -events.listen('recipes', (event) => { - // Additional Lights - event.remove({output: 'additional_lights:fire_for_standing_torch_s'}); - event.remove({output: 'additional_lights:fire_for_standing_torch_l'}); - event.remove({output: 'additional_lights:fire_for_fire_pit_s'}); - event.remove({output: 'additional_lights:fire_for_fire_pit_l'}); - event.remove({output: 'additional_lights:soul_fire_for_standing_torch_s'}); - event.remove({output: 'additional_lights:soul_fire_for_standing_torch_l'}); - event.remove({output: 'additional_lights:soul_fire_for_fire_pit_s'}); - event.remove({output: 'additional_lights:soul_fire_for_fire_pit_l'}); +// priority: 98 - // Environmental Core - event.remove({input: 'envirocore:aethium', output: 'envirocore:aethium'}); - event.remove({input: 'envirocore:litherite', output: 'envirocore:litherite'}); +events.listen('recipes', e => { + var idsToRemove = [ + // Additional Lights + 'additional_lights:fire_for_standing_torch_s', + 'additional_lights:fire_for_standing_torch_l', + 'additional_lights:fire_for_fire_pit_s', + 'additional_lights:fire_for_fire_pit_l', + 'additional_lights:soul_fire_for_standing_torch_s', + 'additional_lights:soul_fire_for_standing_torch_l', + 'additional_lights:soul_fire_for_fire_pit_s', + 'additional_lights:soul_fire_for_fire_pit_l', - // Extra Storage - event.remove({id: 'extrastorage:part/storagepart_256k'}); - event.remove({id: 'extrastorage:part/storagepart_1024k'}); - event.remove({id: 'extrastorage:part/storagepart_4096k'}); - event.remove({id: 'extrastorage:part/storagepart_16384k'}); - event.remove({id: 'extrastorage:part/storagepart_16384k_fluid'}); - event.remove({id: 'extrastorage:part/storagepart_65536k_fluid'}); - event.remove({id: 'extrastorage:part/storagepart_262144k_fluid'}); - event.remove({id: 'extrastorage:part/storagepart_1048576k_fluid'}); - event.remove({id: 'extrastorage:disk/shaped/disk_256k'}); - event.remove({id: 'extrastorage:disk/shaped/disk_1024k'}); - event.remove({id: 'extrastorage:disk/shaped/disk_4096k'}); - event.remove({id: 'extrastorage:disk/shaped/disk_16384k'}); - event.remove({id: 'extrastorage:disk/shaped/disk_16384k_fluid'}); - event.remove({id: 'extrastorage:disk/shaped/disk_65536k_fluid'}); - event.remove({id: 'extrastorage:disk/shaped/disk_262144k_fluid'}); - event.remove({id: 'extrastorage:disk/shaped/disk_1048576k_fluid'}); - event.remove({id: 'extrastorage:disk/shapeless/disk_256k'}); - event.remove({id: 'extrastorage:disk/shapeless/disk_1024k'}); - event.remove({id: 'extrastorage:disk/shapeless/disk_4096k'}); - event.remove({id: 'extrastorage:disk/shapeless/disk_16384k'}); - event.remove({id: 'extrastorage:disk/shapeless/disk_16384k_fluid'}); - event.remove({id: 'extrastorage:disk/shapeless/disk_65536k_fluid'}); - event.remove({id: 'extrastorage:disk/shapeless/disk_262144k_fluid'}); - event.remove({id: 'extrastorage:disk/shapeless/disk_1048576k_fluid'}); + // Extra Storage + 'extrastorage:part/storagepart_256k', + 'extrastorage:part/storagepart_1024k', + 'extrastorage:part/storagepart_4096k', + 'extrastorage:part/storagepart_16384k', + 'extrastorage:part/storagepart_16384k_fluid', + 'extrastorage:part/storagepart_65536k_fluid', + 'extrastorage:part/storagepart_262144k_fluid', + 'extrastorage:part/storagepart_1048576k_fluid', + 'extrastorage:disk/shaped/disk_256k', + 'extrastorage:disk/shaped/disk_1024k', + 'extrastorage:disk/shaped/disk_4096k', + 'extrastorage:disk/shaped/disk_16384k', + 'extrastorage:disk/shaped/disk_16384k_fluid', + 'extrastorage:disk/shaped/disk_65536k_fluid', + 'extrastorage:disk/shaped/disk_262144k_fluid', + 'extrastorage:disk/shaped/disk_1048576k_fluid', + 'extrastorage:disk/shapeless/disk_256k', + 'extrastorage:disk/shapeless/disk_1024k', + 'extrastorage:disk/shapeless/disk_4096k', + 'extrastorage:disk/shapeless/disk_16384k', + 'extrastorage:disk/shapeless/disk_16384k_fluid', + 'extrastorage:disk/shapeless/disk_65536k_fluid', + 'extrastorage:disk/shapeless/disk_262144k_fluid', + 'extrastorage:disk/shapeless/disk_1048576k_fluid', + // Iron Rods + 'immersiveengineering:crafting/stick_iron', - // Iron Rods - event.remove({id: 'immersiveengineering:crafting/stick_iron'}); + // Mekanism + 'mekanism:storage_blocks/charcoal', - // Mana and Artifice - // event.remove({id: 'mana-and-artifice:vinteum_dust'}); - // event.remove({id: 'mana_and_artifice:vinteum_dust_blast_furnace'}); + // Pams + 'pamhc2foodextended:pralinesitem', - // Mekanism - event.remove({id: 'mekanism:storage_blocks/charcoal'}); + // Thermal Series + 'thermal:parts/emerald_gear', + 'thermal:storage/bamboo_block', + 'thermal:storage/gunpowder_block', + 'thermal:storage/sugar_cane_block', + 'thermal:storage/beetroot_block', + 'thermal:storage/apple_block', + 'thermal:storage/potato_block', + 'thermal:storage/carrot_block', + 'thermal:storage/charcoal_block', + 'thermal:storage/sawdust_block', + 'thermal:machine/press/packing3x3/press_bamboo_packing', + 'thermal:machine/press/packing3x3/press_gunpowder_packing', + 'thermal:machine/press/packing3x3/press_sugar_cane_packing', + 'thermal:machine/press/packing3x3/press_beetroot_packing', + 'thermal:machine/press/packing3x3/press_apple_packing', + 'thermal:machine/press/packing3x3/press_potato_packing', + 'thermal:machine/press/packing3x3/press_carrot_packing', + 'thermal:machine/press/packing3x3/press_charcoal_packing', + 'thermal:machine/press/packing3x3/press_sawdust_packing', + 'thermal:phytogro_4', + 'thermal:phytogro_8', - // Pams - event.remove({id: 'pamhc2foodextended:pralinesitem'}); - - // Thermal Series - event.remove({id: 'thermal:parts/emerald_gear'}); - event.remove({id: 'thermal:storage/bamboo_block'}); - event.remove({id: 'thermal:storage/gunpowder_block'}); - event.remove({id: 'thermal:storage/sugar_cane_block'}); - event.remove({id: 'thermal:storage/beetroot_block'}); - event.remove({id: 'thermal:storage/apple_block'}); - event.remove({id: 'thermal:storage/potato_block'}); - event.remove({id: 'thermal:storage/carrot_block'}); - event.remove({id: 'thermal:storage/charcoal_block'}); - event.remove({id: 'thermal:storage/sawdust_block'}); - event.remove({id: 'thermal:machine/press/packing3x3/press_bamboo_packing'}); - event.remove({id: 'thermal:machine/press/packing3x3/press_gunpowder_packing'}); - event.remove({id: 'thermal:machine/press/packing3x3/press_sugar_cane_packing'}); - event.remove({id: 'thermal:machine/press/packing3x3/press_beetroot_packing'}); - event.remove({id: 'thermal:machine/press/packing3x3/press_apple_packing'}); - event.remove({id: 'thermal:machine/press/packing3x3/press_potato_packing'}); - event.remove({id: 'thermal:machine/press/packing3x3/press_carrot_packing'}); - event.remove({id: 'thermal:machine/press/packing3x3/press_charcoal_packing'}); - event.remove({id: 'thermal:machine/press/packing3x3/press_sawdust_packing'}); - event.remove({id: 'thermal:phytogro_4'}); - event.remove({id: 'thermal:phytogro_8'}); - - // Xreliquary - event.remove({id: 'xreliquary:items/uncrafting/redstone'}); - event.remove({id: 'xreliquary:items/uncrafting/gunpowder_witch_hat'}); - event.remove({id: 'xreliquary:items/uncrafting/glowstone_dust'}); -}); \ No newline at end of file + // Xreliquary + 'xreliquary:items/uncrafting/redstone', + 'xreliquary:items/uncrafting/gunpowder_witch_hat', + 'xreliquary:items/uncrafting/glowstone_dust', + ] + + idsToRemove.forEach(remove => { + e.remove({id: remove}) + }) +}) \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/replace.js b/kubejs/server_scripts/fellies/kubejs/recipes/replace.js index e540a2e..09e97c4 100644 --- a/kubejs/server_scripts/fellies/kubejs/recipes/replace.js +++ b/kubejs/server_scripts/fellies/kubejs/recipes/replace.js @@ -1,14 +1,6 @@ -events.listen('recipes', (event) => { - // Immersive Engineering - // event.replaceInput({}, '#minecraft:planks', 'minecraft:gold_nugget'); - // event.replaceOutput({}, 'minecraft:stick', 'minecraft:oak_sapling'); - - // Extra Storage - // event.replaceInput({}, 'extrastorage:storagepart_256k', 'extradisks:256k_storage_part'); - // event.replaceInput({}, 'extrastorage:storagepart_1024k', 'extradisks:1024k_storage_part'); - // event.replaceInput({}, 'extrastorage:storagepart_4096k', 'extradisks:4096k_storage_part'); - // event.replaceInput({}, 'extrastorage:storagepart_16384k', 'extradisks:16384k_storage_part'); +// priority: 98 +events.listen('recipes', e => { // Mana and Artifice - event.replaceInput({}, 'mana-and-artifice:vinteum_ore', '#forge:ores/arcane'); + e.replaceInput({}, 'mana-and-artifice:vinteum_ore', '#forge:ores/arcane'); }); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/shaped.js b/kubejs/server_scripts/fellies/kubejs/recipes/shaped.js deleted file mode 100644 index de82b06..0000000 --- a/kubejs/server_scripts/fellies/kubejs/recipes/shaped.js +++ /dev/null @@ -1,27 +0,0 @@ -events.listen('recipes', (event) => { - // Xreliquary - event.shaped(Item.of('minecraft:glowstone_dust', 6), [ - 'H ', - ' H ', - ' H' - ], { - H: 'xreliquary:witch_hat' - }); - - event.shaped(Item.of('minecraft:gunpowder', 6), [ - ' H ', - ' H ', - ' H ' - ], { - H: 'xreliquary:witch_hat' - }); - - event.shaped(Item.of('minecraft:redstone', 6), [ - 'H ', - ' H ', - 'H ' - ], { - H: 'xreliquary:witch_hat' - }); -}); - diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/shapeless.js b/kubejs/server_scripts/fellies/kubejs/recipes/shapeless.js deleted file mode 100644 index 767fc9f..0000000 --- a/kubejs/server_scripts/fellies/kubejs/recipes/shapeless.js +++ /dev/null @@ -1,11 +0,0 @@ -events.listen('recipes', (event) => { - // Additional Lights - event.shapeless('additional_lights:fire_for_standing_torch_s', ['#fellies:minicoal']); - event.shapeless('additional_lights:fire_for_standing_torch_l', ['#fellies:minicoal', '#fellies:minicoal']); - event.shapeless('additional_lights:fire_for_fire_pit_s', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal']); - event.shapeless('additional_lights:fire_for_fire_pit_l', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal','#fellies:minicoal']); - event.shapeless('additional_lights:soul_fire_for_standing_torch_s', ['#fellies:minicoal', '#forge:soul_sand']); - event.shapeless('additional_lights:soul_fire_for_standing_torch_l', ['#fellies:minicoal', '#fellies:minicoal', '#forge:soul_sand']); - event.shapeless('additional_lights:soul_fire_for_fire_pit_s', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']); - event.shapeless('additional_lights:soul_fire_for_fire_pit_l', ['#fellies:minicoal', '#fellies:minicoal','#fellies:minicoal','#fellies:minicoal', '#forge:soul_sand']); -}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/smelting.js b/kubejs/server_scripts/fellies/kubejs/recipes/smelting.js deleted file mode 100644 index 085cf7b..0000000 --- a/kubejs/server_scripts/fellies/kubejs/recipes/smelting.js +++ /dev/null @@ -1,4 +0,0 @@ -events.listen('recipes', (event) => { - // Mana and artifice - // event.smelting('mana-and-artifice:vinteum_dust', 'emendatusenigmatica:arcane_ore'); -}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/recipes/thermal/thermal.js b/kubejs/server_scripts/fellies/kubejs/recipes/thermal/thermal.js new file mode 100644 index 0000000..1b6adb7 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/recipes/thermal/thermal.js @@ -0,0 +1,20 @@ +// priority: 99 + +/* + * Supported types: + * furnace, sawmill, pulverizer, smelter, centrifuge, press, + * crucible, chiller, refinery, brewer, bottler, + * insolator, pulverizer_catalyst, smelter_catalyst, insolator_catalyst, + * stirling_fuel, compression_fuel, magmatic_fuel, numismatic_fuel, lapidary_fuel + * + * Url: https://www.curseforge.com/minecraft/mc-mods/kubejs-thermal + */ + +events.listen('recipes', e => { + const { + furnace, sawmill, pulverizer, smelter, centrifuge, press, + crucible, chiller, refinery, brewer, bottler, + insolator, pulverizer_catalyst, smelter_catalyst, insolator_catalyst, + stirling_fuel, compression_fuel, magmatic_fuel, numismatic_fuel, lapidary_fuel + } = e.recipes.thermal; +}); \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/tags/blocks.js b/kubejs/server_scripts/fellies/kubejs/tags/blocks.js new file mode 100644 index 0000000..6ccf289 --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/tags/blocks.js @@ -0,0 +1,77 @@ +events.listen('block.tags', e => { + // Missing Stair Tags + var woodenStairs = [ + 'astralsorcery:infused_wood_stairs' + ] + + var stoneStairs = [ + 'astralsorcery:marble_stairs', + 'astralsorcery:black_marble_stairs' + ] + + e.get('minecraft:stairs') + .add(woodenStairs) + .add(stoneStairs) + + // Missing Slab Tags + var woodenSlabs = [ + 'astralsorcery:infused_wood_slab' + ] + + var stoneSlabs = [ + 'astralsorcery:marble_slab', + 'astralsorcery:black_marble_slab' + ] + + e.get('minecraft:slabs') + .add(woodenSlabs) + .add(stoneSlabs) + + e.get('minecraft:wooden_slabs') + .add(woodenSlabs) + + // Sandstone Tags + var orangeSandstones = [ + 'biomesoplenty:orange_sandstone', + 'biomesoplenty:smooth_orange_sandstone', + 'biomesoplenty:cut_orange_sandstone', + 'biomesoplenty:chiseled_orange_sandstone' + ] + + e.get('forge:sandstone/orange') + .add(orangeSandstones) + + var whiteSandstones = [ + 'biomesoplenty:white_sandstone', + 'biomesoplenty:smooth_white_sandstone', + 'biomesoplenty:cut_white_sandstone', + 'biomesoplenty:chiseled_white_sandstone' + ] + + e.get('forge:sandstone/white') + .add(whiteSandstones) + + var blackSandstones = [ + 'biomesoplenty:black_sandstone', + 'biomesoplenty:smooth_black_sandstone', + 'biomesoplenty:cut_black_sandstone', + 'biomesoplenty:chiseled_black_sandstone' + ] + + e.get('forge:sandstone/black') + .add(blackSandstones) + + var soulSandstones = [ + 'quark:soul_sandstone', + 'quark:soul_sandstone_bricks', + 'quark:smooth_soul_sandstone', + 'quark:cut_soul_sandstone', + 'quark:chiseled_soul_sandstone' + ] + + e.get('forge:sandstone/soul') + .add(soulSandstones) + + e.add('forge:sandstone/colorless', 'quark:sandstone_bricks') + e.add('forge:sandstone/red', 'quark:red_sandstone_bricks') +}) \ No newline at end of file diff --git a/kubejs/server_scripts/fellies/kubejs/tags/fellies.js b/kubejs/server_scripts/fellies/kubejs/tags/fellies/fellies.js similarity index 100% rename from kubejs/server_scripts/fellies/kubejs/tags/fellies.js rename to kubejs/server_scripts/fellies/kubejs/tags/fellies/fellies.js diff --git a/kubejs/server_scripts/fellies/kubejs/tags/items.js b/kubejs/server_scripts/fellies/kubejs/tags/items.js new file mode 100644 index 0000000..fb821bf --- /dev/null +++ b/kubejs/server_scripts/fellies/kubejs/tags/items.js @@ -0,0 +1,118 @@ +events.listen('item.tags', e => { + // Missing #forge:sapling item tags. + var saplings = [ + 'quark:yellow_blossom_sapling', + 'quark:lavender_blossom_sapling', + 'quark:pink_blossom_sapling', + 'quark:blue_blossom_sapling', + 'quark:orange_blossom_sapling', + 'quark:red_blossom_sapling', + 'biomesoplenty:origin_sapling', + 'biomesoplenty:flowering_oak_sapling', + 'biomesoplenty:rainbow_birch_sapling', + 'biomesoplenty:yellow_autumn_sapling', + 'biomesoplenty:orange_autumn_sapling', + 'biomesoplenty:maple_sapling', + 'biomesoplenty:fir_sapling', + 'biomesoplenty:redwood_sapling', + 'biomesoplenty:white_cherry_sapling', + 'biomesoplenty:pink_cherry_sapling', + 'biomesoplenty:mahogany_sapling', + 'biomesoplenty:jacaranda_sapling', + 'biomesoplenty:palm_sapling', + 'biomesoplenty:willow_sapling', + 'biomesoplenty:dead_sapling', + 'biomesoplenty:magic_sapling', + 'biomesoplenty:umbran_sapling', + 'biomesoplenty:hellbark_sapling' + ] + e.get('forge:sapling').add(saplings) + + // Missing Wall Tags + var stoneWalls = [ + 'bloodmagic:dungeon_brick_wall', + 'bloodmagic:dungeon_polished_wall' + ] + + e.get('minecraft:walls') + .add(stoneWalls) + + // Missing Stair Tags + var woodenStairs = [ + 'astralsorcery:infused_wood_stairs' + ] + + var stoneStairs = [ + 'astralsorcery:marble_stairs', + 'astralsorcery:black_marble_stairs' + ] + + e.get('minecraft:stairs') + .add(woodenStairs) + .add(stoneStairs) + + // Missing Slab Tags + var woodenSlabs = [ + 'astralsorcery:infused_wood_slab' + ] + + var stoneSlabs = [ + 'astralsorcery:marble_slab', + 'astralsorcery:black_marble_slab' + ] + + e.get('minecraft:slabs') + .add(woodenSlabs) + .add(stoneSlabs) + + e.get('minecraft:wooden_slabs') + .add(woodenSlabs) + + // Sandstone Tags + var orangeSandstones = [ + 'biomesoplenty:orange_sandstone', + 'biomesoplenty:smooth_orange_sandstone', + 'biomesoplenty:cut_orange_sandstone', + 'biomesoplenty:chiseled_orange_sandstone' + ] + + e.get('forge:sandstone/orange') + .add(orangeSandstones) + + var whiteSandstones = [ + 'biomesoplenty:white_sandstone', + 'biomesoplenty:smooth_white_sandstone', + 'biomesoplenty:cut_white_sandstone', + 'biomesoplenty:chiseled_white_sandstone' + ] + + e.get('forge:sandstone/white') + .add(whiteSandstones) + + var blackSandstones = [ + 'biomesoplenty:black_sandstone', + 'biomesoplenty:smooth_black_sandstone', + 'biomesoplenty:cut_black_sandstone', + 'biomesoplenty:chiseled_black_sandstone' + ] + + e.get('forge:sandstone/black') + .add(blackSandstones) + + var soulSandstones = [ + 'quark:soul_sandstone', + 'quark:soul_sandstone_bricks', + 'quark:smooth_soul_sandstone', + 'quark:cut_soul_sandstone', + 'quark:chiseled_soul_sandstone' + ] + + e.get('forge:sandstone/soul') + .add(soulSandstones) + + e.add('forge:sandstone/colorless', 'quark:sandstone_bricks') + e.add('forge:sandstone/red', 'quark:red_sandstone_bricks') + + // Misc Missing Tags + e.add('forge:dusts/obsidian', 'create:powdered_obsidian') +}) \ No newline at end of file diff --git a/kubejs/startup_scripts/items.js b/kubejs/startup_scripts/items.js new file mode 100644 index 0000000..91ec98a --- /dev/null +++ b/kubejs/startup_scripts/items.js @@ -0,0 +1,6 @@ +events.listen('item.registry', function (event) { + event.create('diamond_nugget').group('fellies').displayName('Diamond Nugget'); + event.create('graphite_one').group('fellies').displayName('Graphite 1'); + event.create('graphite_two').group('fellies').displayName('Graphite 2'); + event.create('graphite_three').group('fellies').displayName('Graphite 3'); +}); diff --git a/kubejs/startup_scripts/script.js b/kubejs/startup_scripts/script.js index 15ae840..94231cd 100644 --- a/kubejs/startup_scripts/script.js +++ b/kubejs/startup_scripts/script.js @@ -1,13 +1,13 @@ // priority: 0 -console.info('Hello, World! (You will only see this line once in console, during startup)') +// console.info('Hello, World! (You will only see this line once in console, during startup)') -onEvent('item.registry', event => { - // Register new items here - // event.create('example_item').displayName('Example Item') -}) +// onEvent('item.registry', event => { +// // Register new items here +// // event.create('example_item').displayName('Example Item') +// }) -onEvent('block.registry', event => { - // Register new blocks here - // event.create('example_block').material('wood').hardness(1.0).displayName('Example Block') -}) \ No newline at end of file +// onEvent('block.registry', event => { +// // Register new blocks here +// // event.create('example_block').material('wood').hardness(1.0).displayName('Example Block') +// }) \ No newline at end of file diff --git a/mods/BotanyPots-1.16.5-7.0.2.jar b/mods/BotanyPots-1.16.5-7.0.2.jar deleted file mode 100644 index d03e122..0000000 Binary files a/mods/BotanyPots-1.16.5-7.0.2.jar and /dev/null differ diff --git a/mods/BotanyPots-1.16.5-7.0.6.jar b/mods/BotanyPots-1.16.5-7.0.6.jar new file mode 100644 index 0000000..19fe472 Binary files /dev/null and b/mods/BotanyPots-1.16.5-7.0.6.jar differ diff --git a/mods/Cyclic-1.16.5-1.1.5.jar b/mods/Cyclic-1.16.5-1.1.6.jar similarity index 80% rename from mods/Cyclic-1.16.5-1.1.5.jar rename to mods/Cyclic-1.16.5-1.1.6.jar index a6eec0a..f970152 100644 Binary files a/mods/Cyclic-1.16.5-1.1.5.jar and b/mods/Cyclic-1.16.5-1.1.6.jar differ diff --git a/mods/ImmersiveRailroading-1.16.4-forge-1.8.0.1.jar b/mods/ImmersiveRailroading-1.16.4-forge-1.8.0.1.jar deleted file mode 100644 index bc7ae47..0000000 Binary files a/mods/ImmersiveRailroading-1.16.4-forge-1.8.0.1.jar and /dev/null differ diff --git a/mods/Runelic-1.16.5-7.0.1.jar b/mods/Runelic-1.16.5-7.0.1.jar new file mode 100644 index 0000000..d4e4734 Binary files /dev/null and b/mods/Runelic-1.16.5-7.0.1.jar differ diff --git a/mods/architectury-1.5.105-forge.jar b/mods/architectury-1.5.107-forge.jar similarity index 58% rename from mods/architectury-1.5.105-forge.jar rename to mods/architectury-1.5.107-forge.jar index e074f65..f700565 100644 Binary files a/mods/architectury-1.5.105-forge.jar and b/mods/architectury-1.5.107-forge.jar differ diff --git a/mods/dungeons_plus-1.16.4-1.1.2.jar b/mods/dungeons_plus-1.16.4-1.1.3.jar similarity index 91% rename from mods/dungeons_plus-1.16.4-1.1.2.jar rename to mods/dungeons_plus-1.16.4-1.1.3.jar index 065931d..3ba52ee 100644 Binary files a/mods/dungeons_plus-1.16.4-1.1.2.jar and b/mods/dungeons_plus-1.16.4-1.1.3.jar differ diff --git a/mods/engineerstools-1.16.4-1.1.3.jar b/mods/engineerstools-1.16.4-1.1.4.jar similarity index 77% rename from mods/engineerstools-1.16.4-1.1.3.jar rename to mods/engineerstools-1.16.4-1.1.4.jar index c6ec206..611cf1a 100644 Binary files a/mods/engineerstools-1.16.4-1.1.3.jar and b/mods/engineerstools-1.16.4-1.1.4.jar differ diff --git a/mods/envirocore-1.16.5-3.0.7.0.jar b/mods/envirocore-1.16.5-3.0.7.1.jar similarity index 66% rename from mods/envirocore-1.16.5-3.0.7.0.jar rename to mods/envirocore-1.16.5-3.0.7.1.jar index d1c3f52..2af8511 100644 Binary files a/mods/envirocore-1.16.5-3.0.7.0.jar and b/mods/envirocore-1.16.5-3.0.7.1.jar differ diff --git a/mods/envirotech-1.16.5-3.0.7.0.jar b/mods/envirotech-1.16.5-3.0.7.1.jar similarity index 58% rename from mods/envirotech-1.16.5-3.0.7.0.jar rename to mods/envirotech-1.16.5-3.0.7.1.jar index 6ef4205..abb67f4 100644 Binary files a/mods/envirotech-1.16.5-3.0.7.0.jar and b/mods/envirotech-1.16.5-3.0.7.1.jar differ diff --git a/mods/ftb-gui-library-1605.2.1.37-forge.jar b/mods/ftb-gui-library-1605.2.1.38-forge.jar similarity index 72% rename from mods/ftb-gui-library-1605.2.1.37-forge.jar rename to mods/ftb-gui-library-1605.2.1.38-forge.jar index 2ddcdf2..35ed30e 100644 Binary files a/mods/ftb-gui-library-1605.2.1.37-forge.jar and b/mods/ftb-gui-library-1605.2.1.38-forge.jar differ diff --git a/mods/geckolib-forge-1.16.5-3.0.11.jar b/mods/geckolib-forge-1.16.5-3.0.12.jar similarity index 92% rename from mods/geckolib-forge-1.16.5-3.0.11.jar rename to mods/geckolib-forge-1.16.5-3.0.12.jar index 718b6ab..1f52d43 100644 Binary files a/mods/geckolib-forge-1.16.5-3.0.11.jar and b/mods/geckolib-forge-1.16.5-3.0.12.jar differ diff --git a/mods/industrial-foregoing-1.16.5-3.2.9.1-fbef27c.jar b/mods/industrial-foregoing-1.16.5-3.2.9.2-2b762d7.jar similarity index 69% rename from mods/industrial-foregoing-1.16.5-3.2.9.1-fbef27c.jar rename to mods/industrial-foregoing-1.16.5-3.2.9.2-2b762d7.jar index 605397c..15ee1c7 100644 Binary files a/mods/industrial-foregoing-1.16.5-3.2.9.1-fbef27c.jar and b/mods/industrial-foregoing-1.16.5-3.2.9.2-2b762d7.jar differ diff --git a/mods/kubejs-1605.3.6-build.160-forge.jar b/mods/kubejs-1605.3.6-build.162-forge.jar similarity index 68% rename from mods/kubejs-1605.3.6-build.160-forge.jar rename to mods/kubejs-1605.3.6-build.162-forge.jar index 81c9b72..5e2958d 100644 Binary files a/mods/kubejs-1605.3.6-build.160-forge.jar and b/mods/kubejs-1605.3.6-build.162-forge.jar differ diff --git a/mods/mcjtylib-1.16-5.0.15.jar b/mods/mcjtylib-1.16-5.0.16.jar similarity index 83% rename from mods/mcjtylib-1.16-5.0.15.jar rename to mods/mcjtylib-1.16-5.0.16.jar index 56fcf2f..74832a0 100644 Binary files a/mods/mcjtylib-1.16-5.0.15.jar and b/mods/mcjtylib-1.16-5.0.16.jar differ diff --git a/mods/rftoolscontrol-1.16-4.0.6.jar b/mods/rftoolscontrol-1.16-4.0.7.jar similarity index 85% rename from mods/rftoolscontrol-1.16-4.0.6.jar rename to mods/rftoolscontrol-1.16-4.0.7.jar index 220ff95..6bfc781 100644 Binary files a/mods/rftoolscontrol-1.16-4.0.6.jar and b/mods/rftoolscontrol-1.16-4.0.7.jar differ diff --git a/mods/rftoolsstorage-1.16-2.0.8.jar b/mods/rftoolsstorage-1.16-2.0.9.jar similarity index 80% rename from mods/rftoolsstorage-1.16-2.0.8.jar rename to mods/rftoolsstorage-1.16-2.0.9.jar index bad640f..b74c080 100644 Binary files a/mods/rftoolsstorage-1.16-2.0.8.jar and b/mods/rftoolsstorage-1.16-2.0.9.jar differ diff --git a/mods/rftoolsutility-1.16-3.0.20.jar b/mods/rftoolsutility-1.16-3.0.21.jar similarity index 87% rename from mods/rftoolsutility-1.16-3.0.20.jar rename to mods/rftoolsutility-1.16-3.0.21.jar index 26c539d..8049a46 100644 Binary files a/mods/rftoolsutility-1.16-3.0.20.jar and b/mods/rftoolsutility-1.16-3.0.21.jar differ diff --git a/mods/rsgauges-1.16.4-1.2.8.jar b/mods/rsgauges-1.16.4-1.2.9-b1.jar similarity index 75% rename from mods/rsgauges-1.16.4-1.2.8.jar rename to mods/rsgauges-1.16.4-1.2.9-b1.jar index 69dd8b5..490525a 100644 Binary files a/mods/rsgauges-1.16.4-1.2.8.jar and b/mods/rsgauges-1.16.4-1.2.9-b1.jar differ diff --git a/mods/titanium-1.16.5-3.2.6.1.jar b/mods/titanium-1.16.5-3.2.6.2.jar similarity index 87% rename from mods/titanium-1.16.5-3.2.6.1.jar rename to mods/titanium-1.16.5-3.2.6.2.jar index b5017e6..d69e92d 100644 Binary files a/mods/titanium-1.16.5-3.2.6.1.jar and b/mods/titanium-1.16.5-3.2.6.2.jar differ diff --git a/mods/trashcans-1.0.6a-mc1.16.4.jar b/mods/trashcans-1.0.7-mc1.16.4.jar similarity index 68% rename from mods/trashcans-1.0.6a-mc1.16.4.jar rename to mods/trashcans-1.0.7-mc1.16.4.jar index 7d227e0..890021e 100644 Binary files a/mods/trashcans-1.0.6a-mc1.16.4.jar and b/mods/trashcans-1.0.7-mc1.16.4.jar differ diff --git a/mods/valkyrielib-1.16.5-3.0.7.0.jar b/mods/valkyrielib-1.16.5-3.0.7.1.jar similarity index 85% rename from mods/valkyrielib-1.16.5-3.0.7.0.jar rename to mods/valkyrielib-1.16.5-3.0.7.1.jar index c198831..7f53cfa 100644 Binary files a/mods/valkyrielib-1.16.5-3.0.7.0.jar and b/mods/valkyrielib-1.16.5-3.0.7.1.jar differ