Skip to content

Commit

Permalink
sync
Browse files Browse the repository at this point in the history
  • Loading branch information
McAlec1 committed Dec 9, 2023
1 parent 1dfcda7 commit 53af67f
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 47 deletions.
14 changes: 5 additions & 9 deletions elements/Mcalecspecialbiome.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,7 @@
"value": "Blocks.GRAVEL"
},
"grassColor": {
"value": -10385137,
"falpha": 0.0
},
"foliageColor": {
"value": -12029666,
"value": -16748737,
"falpha": 0.0
},
"waterColor": {
Expand Down Expand Up @@ -46,7 +42,7 @@
"value": "SNOWFLAKE"
},
"particlesProbability": 0.5,
"rainingPossibility": 0.7000000000000001,
"rainingPossibility": 0.76,
"temperature": 0.5,
"spawnBiome": true,
"spawnInCaves": false,
Expand Down Expand Up @@ -95,18 +91,18 @@
"AmethystGeodes",
"ForestGrass"
],
"spawnStronghold": true,
"spawnStronghold": false,
"spawnMineshaft": true,
"spawnMineshaftMesa": false,
"spawnPillagerOutpost": true,
"spawnPillagerOutpost": false,
"villageType": "plains",
"spawnWoodlandMansion": false,
"spawnJungleTemple": false,
"spawnDesertPyramid": false,
"spawnSwampHut": false,
"spawnIgloo": false,
"spawnOceanMonument": false,
"spawnShipwreck": true,
"spawnShipwreck": false,
"spawnShipwreckBeached": false,
"spawnBuriedTreasure": true,
"oceanRuinType": "NONE",
Expand Down
2 changes: 1 addition & 1 deletion elements/MusicUIStopAllSounds.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
"_fv": 47,
"_type": "procedure",
"definition": {
"procedurexml": "<xml xmlns=\"https://developers.google.com/blockly/xml\"><block type=\"event_trigger\" deletable=\"false\" x=\"40\" y=\"40\"><field name=\"trigger\">no_ext_trigger</field><next><block type=\"execute_command\"><value name=\"command\"><block type=\"text\"><field name=\"TEXT\">stopsound @a record</field></block></value><value name=\"x\"><block type=\"coord_x\"></block></value><value name=\"y\"><block type=\"coord_y\"></block></value><value name=\"z\"><block type=\"coord_z\"></block></value></block></next></block></xml>"
"procedurexml": "<xml xmlns=\"https://developers.google.com/blockly/xml\"><block type=\"event_trigger\" deletable=\"false\" x=\"40\" y=\"40\"><field name=\"trigger\">no_ext_trigger</field><next><block type=\"execute_command\"><value name=\"command\"><block type=\"text\"><field name=\"TEXT\">stopsound @r record</field></block></value><value name=\"x\"><block type=\"coord_x\"></block></value><value name=\"y\"><block type=\"coord_y\"></block></value><value name=\"z\"><block type=\"coord_z\"></block></value></block></next></block></xml>"
}
}
2 changes: 1 addition & 1 deletion elements/MusicUIkeybind.mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"_fv": 47,
"_type": "keybind",
"definition": {
"triggerKey": "M",
"triggerKey": "N",
"keyBindingName": "Music UI",
"keyBindingCategoryKey": "ui",
"onKeyPressed": {
Expand Down
21 changes: 8 additions & 13 deletions mcalecsmod.mcreator
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"src/main/java/net/mcalec/mcalecsmod/world/inventory/MusicUIMenu.java"
]
},
"path": "~/MusicUI/Music UI"
"path": "~/Music UI"
},
{
"name": "MusicUIkeybindOnKeyReleased",
Expand Down Expand Up @@ -154,7 +154,7 @@
}
]
},
"path": "~/MusicUI/Music UI"
"path": "~/Music UI"
},
{
"name": "MusicUIkeybind",
Expand All @@ -168,7 +168,7 @@
"src/main/java/net/mcalec/mcalecsmod/network/MusicUIkeybindMessage.java"
]
},
"path": "~/MusicUI/Music UI"
"path": "~/Music UI"
},
{
"name": "McAlecPerson",
Expand Down Expand Up @@ -763,7 +763,7 @@
}
]
},
"path": "~/MusicUI/Music UI"
"path": "~/Music UI"
},
{
"name": "BreakMyStride",
Expand Down Expand Up @@ -1125,15 +1125,6 @@
"foldersRoot": {
"name": "~",
"children": [
{
"name": "MusicUI",
"children": [
{
"name": "Music UI",
"children": []
}
]
},
{
"name": "Advanced Jukebox",
"children": []
Expand Down Expand Up @@ -1170,6 +1161,10 @@
"children": []
}
]
},
{
"name": "Music UI",
"children": []
}
]
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
Original file line number Diff line number Diff line change
@@ -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,
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

0 comments on commit 53af67f

Please sign in to comment.