diff --git a/elements/Mcalecspecialbiome.mod.json b/elements/Mcalecspecialbiome.mod.json
index 236f22b..1f97327 100644
--- a/elements/Mcalecspecialbiome.mod.json
+++ b/elements/Mcalecspecialbiome.mod.json
@@ -13,11 +13,7 @@
"value": "Blocks.GRAVEL"
},
"grassColor": {
- "value": -10385137,
- "falpha": 0.0
- },
- "foliageColor": {
- "value": -12029666,
+ "value": -16748737,
"falpha": 0.0
},
"waterColor": {
@@ -46,7 +42,7 @@
"value": "SNOWFLAKE"
},
"particlesProbability": 0.5,
- "rainingPossibility": 0.7000000000000001,
+ "rainingPossibility": 0.76,
"temperature": 0.5,
"spawnBiome": true,
"spawnInCaves": false,
@@ -95,10 +91,10 @@
"AmethystGeodes",
"ForestGrass"
],
- "spawnStronghold": true,
+ "spawnStronghold": false,
"spawnMineshaft": true,
"spawnMineshaftMesa": false,
- "spawnPillagerOutpost": true,
+ "spawnPillagerOutpost": false,
"villageType": "plains",
"spawnWoodlandMansion": false,
"spawnJungleTemple": false,
@@ -106,7 +102,7 @@
"spawnSwampHut": false,
"spawnIgloo": false,
"spawnOceanMonument": false,
- "spawnShipwreck": true,
+ "spawnShipwreck": false,
"spawnShipwreckBeached": false,
"spawnBuriedTreasure": true,
"oceanRuinType": "NONE",
diff --git a/elements/MusicUIStopAllSounds.mod.json b/elements/MusicUIStopAllSounds.mod.json
index 8bae55c..b35dc4b 100644
--- a/elements/MusicUIStopAllSounds.mod.json
+++ b/elements/MusicUIStopAllSounds.mod.json
@@ -2,6 +2,6 @@
"_fv": 47,
"_type": "procedure",
"definition": {
- "procedurexml": "no_ext_triggerstopsound @a record"
+ "procedurexml": "no_ext_triggerstopsound @r record"
}
}
\ No newline at end of file
diff --git a/elements/MusicUIkeybind.mod.json b/elements/MusicUIkeybind.mod.json
index 5f76256..6eaa4e4 100644
--- a/elements/MusicUIkeybind.mod.json
+++ b/elements/MusicUIkeybind.mod.json
@@ -2,7 +2,7 @@
"_fv": 47,
"_type": "keybind",
"definition": {
- "triggerKey": "M",
+ "triggerKey": "N",
"keyBindingName": "Music UI",
"keyBindingCategoryKey": "ui",
"onKeyPressed": {
diff --git a/mcalecsmod.mcreator b/mcalecsmod.mcreator
index 10ad7c0..be4227f 100644
--- a/mcalecsmod.mcreator
+++ b/mcalecsmod.mcreator
@@ -118,7 +118,7 @@
"src/main/java/net/mcalec/mcalecsmod/world/inventory/MusicUIMenu.java"
]
},
- "path": "~/MusicUI/Music UI"
+ "path": "~/Music UI"
},
{
"name": "MusicUIkeybindOnKeyReleased",
@@ -154,7 +154,7 @@
}
]
},
- "path": "~/MusicUI/Music UI"
+ "path": "~/Music UI"
},
{
"name": "MusicUIkeybind",
@@ -168,7 +168,7 @@
"src/main/java/net/mcalec/mcalecsmod/network/MusicUIkeybindMessage.java"
]
},
- "path": "~/MusicUI/Music UI"
+ "path": "~/Music UI"
},
{
"name": "McAlecPerson",
@@ -763,7 +763,7 @@
}
]
},
- "path": "~/MusicUI/Music UI"
+ "path": "~/Music UI"
},
{
"name": "BreakMyStride",
@@ -1125,15 +1125,6 @@
"foldersRoot": {
"name": "~",
"children": [
- {
- "name": "MusicUI",
- "children": [
- {
- "name": "Music UI",
- "children": []
- }
- ]
- },
{
"name": "Advanced Jukebox",
"children": []
@@ -1170,6 +1161,10 @@
"children": []
}
]
+ },
+ {
+ "name": "Music UI",
+ "children": []
}
]
},
diff --git a/src/main/java/net/mcalec/mcalecsmod/init/McalecsmodModKeyMappings.java b/src/main/java/net/mcalec/mcalecsmod/init/McalecsmodModKeyMappings.java
index 9509bf0..aae1ff1 100644
--- a/src/main/java/net/mcalec/mcalecsmod/init/McalecsmodModKeyMappings.java
+++ b/src/main/java/net/mcalec/mcalecsmod/init/McalecsmodModKeyMappings.java
@@ -20,7 +20,7 @@
@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = {Dist.CLIENT})
public class McalecsmodModKeyMappings {
- public static final KeyMapping MUSIC_U_IKEYBIND = new KeyMapping("key.mcalecsmod.music_u_ikeybind", GLFW.GLFW_KEY_M, "key.categories.ui") {
+ public static final KeyMapping MUSIC_U_IKEYBIND = new KeyMapping("key.mcalecsmod.music_u_ikeybind", GLFW.GLFW_KEY_N, "key.categories.ui") {
private boolean isDownOld = false;
@Override
diff --git a/src/main/java/net/mcalec/mcalecsmod/procedures/MusicUIStopAllSoundsProcedure.java b/src/main/java/net/mcalec/mcalecsmod/procedures/MusicUIStopAllSoundsProcedure.java
index 0af5664..efef3f8 100644
--- a/src/main/java/net/mcalec/mcalecsmod/procedures/MusicUIStopAllSoundsProcedure.java
+++ b/src/main/java/net/mcalec/mcalecsmod/procedures/MusicUIStopAllSoundsProcedure.java
@@ -12,6 +12,6 @@ public class MusicUIStopAllSoundsProcedure {
public static void execute(LevelAccessor world, double x, double y, double z) {
if (world instanceof ServerLevel _level)
_level.getServer().getCommands().performPrefixedCommand(new CommandSourceStack(CommandSource.NULL, new Vec3(x, y, z), Vec2.ZERO, _level, 4, "", Component.literal(""), _level.getServer(), null).withSuppressedOutput(),
- "stopsound @a record");
+ "stopsound @r record");
}
}
diff --git a/src/main/resources/data/mcalecsmod/worldgen/biome/mcalecspecialbiome.json b/src/main/resources/data/mcalecsmod/worldgen/biome/mcalecspecialbiome.json
index f6de441..b6241e1 100644
--- a/src/main/resources/data/mcalecsmod/worldgen/biome/mcalecspecialbiome.json
+++ b/src/main/resources/data/mcalecsmod/worldgen/biome/mcalecspecialbiome.json
@@ -1,11 +1,11 @@
{
"has_precipitation": true,
"temperature": 0.5,
- "downfall": 0.7,
+ "downfall": 0.76,
"effects": {
"ambient_sound": "mcalecsmod:nintendo_rosalina-in-the-observatory-3_smg",
- "foliage_color": -12029666,
- "grass_color": -10385137,
+ "foliage_color": 10387789,
+ "grass_color": -16748737,
"sky_color": 7972607,
"fog_color": 12638463,
"water_color": -16737895,
diff --git a/src/main/resources/data/minecraft/tags/worldgen/biome/has_structure/pillager_outpost.json b/src/main/resources/data/minecraft/tags/worldgen/biome/has_structure/pillager_outpost.json
deleted file mode 100644
index 54085f9..0000000
--- a/src/main/resources/data/minecraft/tags/worldgen/biome/has_structure/pillager_outpost.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "replace": false,
- "values": [
- "mcalecsmod:mcalecspecialbiome"
- ]
-}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/worldgen/biome/has_structure/shipwreck.json b/src/main/resources/data/minecraft/tags/worldgen/biome/has_structure/shipwreck.json
deleted file mode 100644
index 54085f9..0000000
--- a/src/main/resources/data/minecraft/tags/worldgen/biome/has_structure/shipwreck.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "replace": false,
- "values": [
- "mcalecsmod:mcalecspecialbiome"
- ]
-}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/tags/worldgen/biome/has_structure/stronghold.json b/src/main/resources/data/minecraft/tags/worldgen/biome/has_structure/stronghold.json
deleted file mode 100644
index 54085f9..0000000
--- a/src/main/resources/data/minecraft/tags/worldgen/biome/has_structure/stronghold.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "replace": false,
- "values": [
- "mcalecsmod:mcalecspecialbiome"
- ]
-}
\ No newline at end of file