Skip to content

Commit

Permalink
Merge pull request #15 from skyraah/main
Browse files Browse the repository at this point in the history
增加初步生物控制,增加初步矿物控制,更新mod
  • Loading branch information
skyraah authored Aug 2, 2024
2 parents 0460fc5 + e039c73 commit 2b7ad19
Show file tree
Hide file tree
Showing 32 changed files with 2,573 additions and 2,312 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/devBuilder.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.x'

Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ example.*
/resourcepacks
config/oculus.properties
config/blockswap/known_states
config/embeddium
config/xaerominimap_entities.json
config/embeddium*
config/xaerominimap*
8 changes: 8 additions & 0 deletions config/almostunified/debug.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"dumpTagMap": false,
"dumpDuplicates": false,
"dumpUnification": false,
"dumpOverview": false,
"dumpRecipes": false,
"dumpUncoveredRecipes": false
}
35 changes: 35 additions & 0 deletions config/almostunified/duplicates.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"ignoredRecipeTypes": [
"cucumber:shaped_tag"
],
"ignoredRecipes": [],
"defaultDuplicateRules": {
"ignoredFields": [
"show_notification",
"conditions",
"category",
"group"
],
"rules": {
"cookingtime": "HigherRule",
"energy": "HigherRule",
"experience": "HigherRule"
},
"shouldSanitize": false
},
"overrideDuplicateRules": {
"minecraft:crafting_shaped": {
"ignoredFields": [
"pattern",
"show_notification",
"conditions",
"category",
"key",
"group"
],
"rules": {},
"shouldSanitize": false
}
},
"strictMode": false
}
3 changes: 3 additions & 0 deletions config/almostunified/startup.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"serverOnly": false
}
98 changes: 98 additions & 0 deletions config/almostunified/unify.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
{
"modPriorities": [
"minecraft",
"kubejs",
"crafttweaker",
"oreganized",
"occultism",
"embers",
"wizards_reborn",
"eidolon"
],
"stoneStrata": [
"stone",
"nether",
"deepslate",
"granite",
"diorite",
"andesite"
],
"tags": [
"forge:nuggets/{material}",
"forge:dusts/{material}",
"forge:gears/{material}",
"forge:gems/{material}",
"forge:ingots/{material}",
"forge:raw_materials/{material}",
"forge:ores/{material}",
"forge:plates/{material}",
"forge:rods/{material}",
"forge:wires/{material}",
"forge:storage_blocks/{material}",
"forge:storage_blocks/raw_{material}"
],
"materials": [
"aeternium",
"aluminum",
"amber",
"apatite",
"bitumen",
"brass",
"bronze",
"charcoal",
"chrome",
"cinnabar",
"coal",
"coal_coke",
"cobalt",
"constantan",
"copper",
"diamond",
"electrum",
"elementium",
"emerald",
"enderium",
"fluorite",
"gold",
"graphite",
"invar",
"iridium",
"iron",
"lapis",
"lead",
"lumium",
"mithril",
"netherite",
"nickel",
"obsidian",
"osmium",
"peridot",
"platinum",
"potassium_nitrate",
"ruby",
"sapphire",
"signalum",
"silver",
"steel",
"sulfur",
"tin",
"tungsten",
"uranium",
"zinc",
"arcane_gold"
],
"priorityOverrides": {},
"customTags": {},
"tagOwnerships": {},
"itemTagInheritanceMode": "ALLOW",
"itemTagInheritance": {},
"blockTagInheritanceMode": "ALLOW",
"blockTagInheritance": {},
"ignoredTags": [],
"ignoredItems": [],
"ignoredRecipeTypes": [
"cucumber:shaped_tag"
],
"ignoredRecipes": [],
"itemsHidingJeiRei": true
}
24 changes: 24 additions & 0 deletions config/appleskin-client.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@

[client]
#If true, shows the hunger (and saturation if showSaturationHudOverlay is true) that would be restored by food you are currently holding
showFoodValuesHudOverlay = true
#If true, shows your food exhaustion as a progress bar behind the hunger bars
showFoodExhaustionHudUnderlay = true
#Alpha value of the flashing icons at their most visible point (1.0 = fully opaque, 0.0 = fully transparent)
#Range: 0.0 ~ 1.0
maxHudOverlayFlashAlpha = 0.65
#If true, health/hunger overlay will shake to match Minecraft's icon animations
showVanillaAnimationsOverlay = true
#If true, adds a line that shows your hunger, saturation, and exhaustion level in the F3 debug overlay
showFoodStatsInDebugOverlay = true
#If true, shows the hunger and saturation values of food in its tooltip while holding SHIFT
showFoodValuesInTooltip = true
#If true, shows the hunger and saturation values of food in its tooltip automatically (without needing to hold SHIFT)
showFoodValuesInTooltipAlways = true
#If true, shows estimated health restored by food on the health bar
showFoodHealthHudOverlay = true
#If true, shows your current saturation level overlayed on the hunger bar
showSaturationHudOverlay = true
#If true, enables the hunger/saturation/health overlays for food in your off-hand
showFoodValuesHudOverlayWhenOffhand = true

94 changes: 13 additions & 81 deletions config/blockswap/block_swap.json5
Original file line number Diff line number Diff line change
@@ -1,88 +1,20 @@
/*
This file uses the ".json5" file extension which allows for comments like this in a json file!
Your text editor may show this file with invalid/no syntax, if so, we recommend you download:
VSCode: https://code.visualstudio.com/
JSON5 plugin(for VSCode): https://marketplace.visualstudio.com/items?itemName=mrmlnc.vscode-json5
to make editing this file much easier.
*/
{
// Generates all block states for all blocks in the registry.
"generate_all_known_states": true,
// Whether blocks are replaced in existing chunks.
"retro_gen": false,
/* A map of states that specifies what the "old" block state is and what its "new" block state is.
See "known_states" folder("generate_all_known_states" must be set to true in this config) to see all known block states available for all blocks available in the registry.
Example:
"state_swapper": [
{
"new": {
"Name": "minecraft:birch_log",
// Properties define the state of this block/fluid.
"Properties": {
"axis": "x"
}
},
"old": {
"Name": "minecraft:oak_log",
// Properties define the state of this block/fluid.
"Properties": {
"axis": "z"
}
}
},
{
"new": {
"Name": "minecraft:birch_leaves",
// Properties define the state of this block/fluid.
"Properties": {
"distance": "7",
"persistent": "true"
}
},
"old": {
"Name": "minecraft:acacia_log",
// Properties define the state of this block/fluid.
"Properties": {
"axis": "z"
}
}
},
{
"new": {
"Name": "minecraft:jungle_log",
// Properties define the state of this block/fluid.
"Properties": {
"axis": "x"
}
},
"old": {
"Name": "minecraft:birch_log",
// Properties define the state of this block/fluid.
"Properties": {
"axis": "z"
}
}
},
{
"new": {
"Name": "minecraft:jungle_planks",
},
"old": {
"Name": "minecraft:acacia_planks",
}
}
}
]
*/
"state_swapper": [],
/* A map of blocks that specifies what the "old" block is and what its "new" block is.
Example:
"swapper": {
"minecraft:coarse_dirt": "minecraft:dirt",
"minecraft:diamond_block": "minecraft:emerald_block"
}
*/
"swapper": { }
"swapper": {
"embers:lead_ore": "oreganized:lead_ore",
"eidolon:lead_ore": "oreganized:lead_ore",
"embers:deepslate_lead_ore": "oreganized:deepslate_lead_ore",
"eidolon:deep_lead_ore": "oreganized:deepslate_lead_ore",

"embers:silver_ore": "oreganized:silver_ore",
"occultism:silver_ore": "oreganized:silver_ore",
"eidolon:silver_ore": "oreganized:silver_ore",
"embers:deepslate_silver_ore": "oreganized:deepslate_silver_ore",
"occultism:silver_ore_deepslate": "oreganized:deepslate_silver_ore",
"eidolon:deep_silver_ore": "oreganized:deepslate_silver_ore"
}
}
14 changes: 14 additions & 0 deletions config/champions-client.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@

[hud]
#The x-offset for the champion HUD
#Range: -1000 ~ 1000
hudXOffset = 0
#The y-offset for the champion HUD
#Range: -1000 ~ 1000
hudYOffset = 0
#The distance, in blocks, from which the champion HUD can be seen
#Range: 0 ~ 1000
hudRange = 50
#Set to true to move the WAILA overlay underneath the champion HUD
enableWailaIntegration = true

4 changes: 2 additions & 2 deletions config/enhanced_boss_bars-common.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@

[mowziesmobs]
#Show Frostmaw
FrostmawBossBar = true
FrostmawBossBar = false
#Show Ferrous Wroughtnaut
FerrousWroughtnautBossBar = true
FerrousWroughtnautBossBar = false

[meetyourfight]
#Show Bellringer
Expand Down
Loading

0 comments on commit 2b7ad19

Please sign in to comment.