diff --git a/Common/src/main/resources/assets/tardim_ic/lang/en_uk.json b/Common/src/main/resources/assets/tardim_ic/lang/en_uk.json index 10f9f74..c0f8968 100644 --- a/Common/src/main/resources/assets/tardim_ic/lang/en_uk.json +++ b/Common/src/main/resources/assets/tardim_ic/lang/en_uk.json @@ -3,5 +3,6 @@ "block.tardim_ic.redstone_tardim_input": "Redstone TARDIM Input", "block.tardim_ic.tardim_dock": "TARDIM Dock", "itemGroup.tardim_ic": "TARDIM: In Control", - "itemGroup.minecraft.tardim_ic": "TARDIM: In Control" + "itemGroup.minecraft.tardim_ic": "TARDIM: In Control", + "subtitles.tardim_ic.cloister": "Cloister bell rings" } \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/lang/en_us.json b/Common/src/main/resources/assets/tardim_ic/lang/en_us.json index 10f9f74..c0f8968 100644 --- a/Common/src/main/resources/assets/tardim_ic/lang/en_us.json +++ b/Common/src/main/resources/assets/tardim_ic/lang/en_us.json @@ -3,5 +3,6 @@ "block.tardim_ic.redstone_tardim_input": "Redstone TARDIM Input", "block.tardim_ic.tardim_dock": "TARDIM Dock", "itemGroup.tardim_ic": "TARDIM: In Control", - "itemGroup.minecraft.tardim_ic": "TARDIM: In Control" + "itemGroup.minecraft.tardim_ic": "TARDIM: In Control", + "subtitles.tardim_ic.cloister": "Cloister bell rings" } \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/lang/rpr.json b/Common/src/main/resources/assets/tardim_ic/lang/rpr.json index d2d603b..51c5140 100644 --- a/Common/src/main/resources/assets/tardim_ic/lang/rpr.json +++ b/Common/src/main/resources/assets/tardim_ic/lang/rpr.json @@ -3,6 +3,6 @@ "block.tardim_ic.redstone_tardim_input": "Краснокаменный Инпутъ Хронобудки", "block.tardim_ic.tardim_dock": "Конюшня для TARDIM", "itemGroup.tardim_ic": "ТАРДИМЪ: Подъ Контрольемъ", - "itemGroup.minecraft.tardim_ic": "ТАРДИМЪ: Подъ Контрольемъ" - + "itemGroup.minecraft.tardim_ic": "ТАРДИМЪ: Подъ Контрольемъ", + "subtitles.tardim_ic.cloister": "Звукъ временного колокола" } \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/lang/ru_ru.json b/Common/src/main/resources/assets/tardim_ic/lang/ru_ru.json index 1cb3857..27ccb07 100644 --- a/Common/src/main/resources/assets/tardim_ic/lang/ru_ru.json +++ b/Common/src/main/resources/assets/tardim_ic/lang/ru_ru.json @@ -3,5 +3,6 @@ "block.tardim_ic.redstone_tardim_input": "Редстоуновый ввод TARDIM", "block.tardim_ic.tardim_dock": "Стыковочная станция для TARDIM", "itemGroup.tardim_ic": "TARDIM: In Control", - "itemGroup.minecraft.tardim_ic": "TARDIM: In Control" + "itemGroup.minecraft.tardim_ic": "TARDIM: In Control", + "subtitles.tardim_ic.cloister": "Звон монастырского колокола" } \ No newline at end of file diff --git a/Common/src/main/resources/assets/tardim_ic/sounds.json b/Common/src/main/resources/assets/tardim_ic/sounds.json new file mode 100644 index 0000000..e66c8c9 --- /dev/null +++ b/Common/src/main/resources/assets/tardim_ic/sounds.json @@ -0,0 +1,9 @@ +{ + "cloister": { + "subtitle": "subtitles.tardim_ic.cloister", + "sounds": [ + "tardim_ic:cloister" + ] + } +} + diff --git a/Common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg b/Common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg new file mode 100644 index 0000000..9c9f38a Binary files /dev/null and b/Common/src/main/resources/assets/tardim_ic/sounds/cloister.ogg differ diff --git a/Common/src/main/resources/iconCurseForge.png b/Common/src/main/resources/iconCurseForge.png new file mode 100644 index 0000000..dac272e Binary files /dev/null and b/Common/src/main/resources/iconCurseForge.png differ diff --git a/Common/src/main/resources/pack.mcmeta b/Common/src/main/resources/pack.mcmeta index 20f2fe7..760e561 100644 --- a/Common/src/main/resources/pack.mcmeta +++ b/Common/src/main/resources/pack.mcmeta @@ -1,7 +1,6 @@ { "pack": { "description": "TARDIM: In Control resources", - "pack_format": 6, - "_comment": "A pack_format of 6 requires json lang files and some texture changes from 1.16.2. Note: we require v6 pack meta for all mods." + "pack_format": 6 } } diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/command/CommandCloisterBell.java b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/command/CommandCloisterBell.java index 00479cc..bdc60fa 100644 --- a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/command/CommandCloisterBell.java +++ b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/command/CommandCloisterBell.java @@ -5,8 +5,14 @@ import com.swdteam.tardim.common.command.tardim.ICommand; import com.swdteam.tardim.tardim.TardimData; import com.swdteam.tardim.tardim.TardimManager; import net.minecraft.core.BlockPos; +import net.minecraft.resources.ResourceKey; +import net.minecraft.sounds.SoundSource; import net.minecraft.world.entity.player.Player; +import com.swdteam.tardim.common.init.TRDDimensions; +import net.minecraft.world.level.Level; +import su.a71.tardim_ic.tardim_ic.Registration; + //import static com.swdteam.common.command.tardim.CommandTardimBase.sendResponse; public class CommandCloisterBell implements ICommand { @@ -17,6 +23,18 @@ public class CommandCloisterBell implements ICommand { if (data != null) { if (data.hasPermission(player)) { try { + Level lvl = player.getLevel(); + if (!lvl.isClientSide) { + lvl.playSound( + null, + pos, + Registration.CLOISTER_SOUND_EVENT, + SoundSource.BLOCKS, + 1.5f, + 1f + ); + } + CommandTardimBase.sendResponse(player, "", CommandTardimBase.ResponseType.COMPLETE, source); } catch (Exception var9) { CommandTardimBase.sendResponse(player, "There was an error", CommandTardimBase.ResponseType.FAIL, source); diff --git a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CommandInit.java b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CommandInit.java index bc68ea7..4db50bf 100644 --- a/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CommandInit.java +++ b/Fabric/src/main/java/su/a71/tardim_ic/tardim_ic/registration/CommandInit.java @@ -9,6 +9,6 @@ import su.a71.tardim_ic.tardim_ic.command.CommandModemTransmit; public class CommandInit { public static void init() { CommandManager.register(new CommandModemTransmit()); - //CommandManager.register(new CommandCloisterBell()); + CommandManager.register(new CommandCloisterBell()); } }