Merge pull request #9 from skyraah/main

update mod
CrychicTeam · Jul 15, 2024 · e5091dd · e5091dd
2 parents 34a6f20 + 54bd9cc
commit e5091dd
Show file tree

Hide file tree

Showing 149 changed files with 5,800 additions and 2,056 deletions.
diff --git a/.github/workflows/devBuilder.yaml b/.github/workflows/devBuilder.yaml
@@ -21,5 +21,5 @@ jobs:
       - name: Upload a Build Artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ env.BUILD }}-${{ env.VERSION }}.${{ github.run_number }}
+          name: ${{ env.BUILD }}-${{ env.VERSION }}.bulid-${{ github.run_number }}
           path: .artifacts
diff --git a/.gitignore b/.gitignore
@@ -33,4 +33,5 @@ example.*
 /saves
 /screenshots
 /shaderpacks
-/resourcepacks
+/resourcepacks
+config/oculus.properties
diff --git a/config/ambientsounds-client.json b/config/ambientsounds-client.json
@@ -0,0 +1,214 @@
+{
+  "general": {
+    "engines": 0,
+    "volume": 1,
+    "useSoundMasterSource": false,
+    "scanStepAmount": 100,
+    "playSoundWithOffset": true
+  },
+  "dimensions": {
+    "abyssalcraft": 1,
+    "betweenlands": 1,
+    "cave": 1,
+    "end": 1,
+    "galacticraft": 1,
+    "galacticraft.planets": 1,
+    "midnight": 1,
+    "nether": 1,
+    "surface": 1,
+    "twilightforest": 1,
+    "void": 1
+  },
+  "regions": {
+    "abyssalcraft_dark": {
+      "overall": 1,
+      "suspense.suspense": 1
+    },
+    "end_unknown": {
+      "overall": 1,
+      "suspense.suspense": 1
+    },
+    "galacticraft_planets_wind": {
+      "overall": 1,
+      "wind.light-wind": 1
+    },
+    "nether_suspense": {
+      "overall": 1,
+      "nether": 1
+    },
+    "twilightforest_unknown": {
+      "overall": 1,
+      "suspense.suspense": 1
+    },
+    "void_dark": {
+      "overall": 1,
+      "suspense.suspense": 1
+    },
+    "beach": {
+      "overall": 1,
+      "beach": 1,
+      "seagull": 1,
+      "seagull-long": 1
+    },
+    "cave_ambience": {
+      "overall": 1,
+      "cave": 1,
+      "cave-water": 1,
+      "cave-deep": 1,
+      "cave-large": 1
+    },
+    "cave_deep-dark": {
+      "overall": 1,
+      "deep-dark": 1,
+      "water-droplets": 1
+    },
+    "cave": {
+      "overall": 1
+    },
+    "cave_lush": {
+      "overall": 1,
+      "cave-lush": 1,
+      "frog": 1
+    },
+    "cold_artic": {
+      "overall": 1,
+      "heavy-wind": 1
+    },
+    "cold": {
+      "overall": 1,
+      "wind.light-wind": 1
+    },
+    "desert": {
+      "overall": 1,
+      "cicadas-desert": 1,
+      "wind.light-wind": 1
+    },
+    "forest_cold": {
+      "overall": 1,
+      "crow": 1
+    },
+    "forest": {
+      "overall": 1,
+      "bird-ambience": 1,
+      "owl": 1
+    },
+    "forest_roofed": {
+      "overall": 1,
+      "bird-ambience-spooky": 1
+    },
+    "grass": {
+      "overall": 1,
+      "cricket": 1,
+      "cricket-night": 1,
+      "cicadas-night": 1
+    },
+    "highland": {
+      "overall": 1,
+      "heavy-wind": 1,
+      "wind-in-leaves": 1
+    },
+    "jungle": {
+      "overall": 1,
+      "cricket-jungle": 1,
+      "cricket-jungle-night": 1,
+      "bird-ambience-jungle": 1,
+      "bird-ambience-jungle-night": 1
+    },
+    "mesa": {
+      "overall": 1,
+      "wind-mesa": 1
+    },
+    "mushroom_fields": {
+      "overall": 1,
+      "cicadas-mushroom-fields": 1,
+      "special-mushroom-fields": 1
+    },
+    "ocean": {
+      "overall": 1,
+      "ocean": 1,
+      "wind.light-wind": 1
+    },
+    "plains": {
+      "overall": 1,
+      "cricket": 1,
+      "cricket-night": 1,
+      "cicadas-night": 1
+    },
+    "rain": {
+      "overall": 1,
+      "rain": 1
+    },
+    "savanna": {
+      "overall": 1,
+      "cricket": 1,
+      "cicadas": 1,
+      "cicadas-desert": 1,
+      "cricket-warm-night": 1,
+      "wolf": 1,
+      "bird-warm": 1
+    },
+    "sky": {
+      "overall": 1,
+      "wind.light-wind": 1
+    },
+    "space": {
+      "overall": 1
+    },
+    "storm_away": {
+      "overall": 1,
+      "storm-away": 1,
+      "howling-wind": 1
+    },
+    "storm_close": {
+      "overall": 1,
+      "storm-close": 1,
+      "wind": 1
+    },
+    "surface": {
+      "overall": 1
+    },
+    "swamp": {
+      "overall": 1,
+      "cricket-swamp": 1,
+      "cricket-warm-night": 1,
+      "frog": 1
+    },
+    "taiga": {
+      "overall": 1,
+      "bird-ambience-huge": 1
+    },
+    "underwater": {
+      "overall": 1,
+      "underwater": 1,
+      "underwater-deep": 1
+    },
+    "underworld": {
+      "overall": 1,
+      "underworld": 1
+    },
+    "warden": {
+      "overall": 1,
+      "warden": 1
+    }
+  },
+  "categories": {
+    "animal": {
+      "animal": 1,
+      "bird": {
+        "bird": 1,
+        "bird_day": 1,
+        "bird_night": 1
+      },
+      "cicadas": 1,
+      "cricket": 1,
+      "cricket_day": 1,
+      "cricket_night": 1
+    },
+    "cave": 1,
+    "weather": 1,
+    "wind": 1
+  },
+  "fade-volume": 0.005,
+  "fade-pitch": 0.005,
+  "silent-dimensions": []
+}
diff --git a/config/ars_nouveau-client.toml b/config/ars_nouveau-client.toml
@@ -35,7 +35,7 @@
 	#If the Storage Lectern should show the recipe book icon
 	showRecipeBook = true
 	#Inform the player of Dynamic lights once.
-	informLights = true
+	informLights = false
 
 #Misc
 [misc]

diff --git a/config/ars_nouveau-server.toml b/config/ars_nouveau-server.toml
@@ -0,0 +1,57 @@
+
+#Mana
+[mana]
+	#Base mana regen in seconds
+	#Range: > 0
+	baseRegen = 5
+	#Base max mana
+	#Range: > 0
+	baseMax = 100
+	#How often max and regen will be calculated, in ticks. NOTE: Having the base mana regen AT LEAST this value is recommended.
+	#Range: 1 ~ 20
+	updateInterval = 5
+	#Max mana bonus per glyph
+	#Range: > 0
+	glyphmax = 15
+	#Max mana bonus for tier of book
+	#Range: > 0
+	tierMax = 50
+	#Mana regen bonus for tier of book
+	#Range: > 0
+	tierRegen = 1
+	#Mana Boost value per level
+	#Range: > 0
+	manaBoost = 25
+	#(enchantment) Mana regen per second per level
+	#Range: > 0
+	manaRegenEnchantment = 2
+	#Regen bonus per glyph
+	#Range: 0.0 ~ 2.147483647E9
+	glyphRegen = 0.33
+	#Regen bonus per potion level
+	#Range: > 0
+	potionRegen = 10
+
+[spell_casting]
+	#Enforce augment cap on casting? Turn this off if you are a pack maker and want to create more powerful items than players.
+	enforceCapOnCast = true
+	#Enforce glyph per spell limit on casting? Turn this off if you are a pack maker and want to create more powerful items than players.
+	enforceGlyphLimitOnCast = true
+
+[item]
+	#Cost per glyph in a codex
+	#Range: > 0
+	codexCost = 10
+
+[warp_portals]
+	#Enable warp portals?
+	enableWarpPortals = true
+
+#Beta Features
+[beta]
+	#Allow crafting infinite spells. This is a beta feature and may cause crashes.
+	infiniteSpells = false
+	#Limits the crafting infinite spells beta, set a cap to the number of additional glyphs. This is a beta feature and may cause crashes.
+	#Range: 10 ~ 1000
+	infiniteSpellLimit = 30
+
diff --git a/config/ars_nouveau/burst.toml b/config/ars_nouveau/burst.toml
@@ -0,0 +1,26 @@
+
+#General settings
+[general]
+	#Is Enabled?
+	enabled = true
+	#Cost
+	#Range: > -2147483648
+	cost = 500
+	#Is Starter Glyph?
+	starter = false
+	#The maximum number of times this glyph may appear in a single spell
+	#Range: 1 ~ 1
+	per_spell_limit = 1
+	#The tier of the glyph
+	#Range: 1 ~ 99
+	glyph_tier = 3
+	#Limits the number of times a given augment may be applied to a given effect
+	#Example entry: "glyph_amplify=5"
+	augment_limits = []
+	#How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config.
+	#Example entry: "glyph_amplify=50"
+	augment_cost_overrides = []
+	#Prevents the given glyph from being used in the same spell as the given glyph
+	#Example entry: "glyph_burst"
+	invalid_combos = ["ars_nouveau:glyph_wall", "ars_nouveau:glyph_linger"]
+
diff --git a/config/ars_nouveau/glyph_accelerate.toml b/config/ars_nouveau/glyph_accelerate.toml
@@ -0,0 +1,17 @@
+
+#General settings
+[general]
+	#Is Enabled?
+	enabled = true
+	#Cost
+	#Range: > -2147483648
+	cost = 10
+	#Is Starter Glyph?
+	starter = false
+	#The maximum number of times this glyph may appear in a single spell
+	#Range: > 1
+	per_spell_limit = 2147483647
+	#The tier of the glyph
+	#Range: 1 ~ 99
+	glyph_tier = 2
+
diff --git a/config/ars_nouveau/glyph_amplify.toml b/config/ars_nouveau/glyph_amplify.toml
@@ -0,0 +1,17 @@
+
+#General settings
+[general]
+	#Is Enabled?
+	enabled = true
+	#Cost
+	#Range: > -2147483648
+	cost = 20
+	#Is Starter Glyph?
+	starter = false
+	#The maximum number of times this glyph may appear in a single spell
+	#Range: > 1
+	per_spell_limit = 2147483647
+	#The tier of the glyph
+	#Range: 1 ~ 99
+	glyph_tier = 1
+
diff --git a/config/ars_nouveau/glyph_animate_block.toml b/config/ars_nouveau/glyph_animate_block.toml
@@ -0,0 +1,32 @@
+
+#General settings
+[general]
+	#Is Enabled?
+	enabled = true
+	#Cost
+	#Range: > -2147483648
+	cost = 200
+	#Is Starter Glyph?
+	starter = false
+	#The maximum number of times this glyph may appear in a single spell
+	#Range: > 1
+	per_spell_limit = 2147483647
+	#The tier of the glyph
+	#Range: 1 ~ 99
+	glyph_tier = 2
+	#Limits the number of times a given augment may be applied to a given effect
+	#Example entry: "glyph_amplify=5"
+	augment_limits = []
+	#How much an augment should cost when used on this effect or form. This overrides the default cost in the augment config.
+	#Example entry: "glyph_amplify=50"
+	augment_cost_overrides = []
+	#Prevents the given glyph from being used in the same spell as the given glyph
+	#Example entry: "glyph_burst"
+	invalid_combos = []
+	#Base duration in seconds
+	#Range: > 0
+	duration = 60
+	#Extend time duration, in seconds
+	#Range: > 0
+	extend_time = 60
+