diff --git a/dependencies.gradle b/dependencies.gradle index 3207b9b..42adb0d 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -11,5 +11,5 @@ dependencies { api('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') api('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') - compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.420:dev') + compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.51.427:dev') } diff --git a/src/main/java/emt/EMT.java b/src/main/java/emt/EMT.java index 8aaa3d4..b4eb261 100644 --- a/src/main/java/emt/EMT.java +++ b/src/main/java/emt/EMT.java @@ -41,7 +41,8 @@ public class EMT { public static final String NAME = "Electro-Magic Tools"; public static final String MOD_ID = "EMT"; public static final String VERSION = EMTTags.VERSION; - public static final String TEXTURE_PATH = "emt"; + public static final String RESOURCE_PATH = "emt"; + public static final String TEXTURE_PATH = RESOURCE_PATH; public static final String GUI_FACTORY = "emt.client.gui.config.EMTGuiFactory"; public static final String CLIENT_PROXY = "emt.proxy.ClientProxy"; public static final String COMMON_PROXY = "emt.proxy.CommonProxy"; diff --git a/src/main/java/emt/item/focus/ItemMaintenanceFocus.java b/src/main/java/emt/item/focus/ItemMaintenanceFocus.java index 7ba278e..f6912b9 100644 --- a/src/main/java/emt/item/focus/ItemMaintenanceFocus.java +++ b/src/main/java/emt/item/focus/ItemMaintenanceFocus.java @@ -1,9 +1,12 @@ package emt.item.focus; +import static emt.EMT.RESOURCE_PATH; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.MovingObjectPosition; +import net.minecraft.util.ResourceLocation; import net.minecraft.world.World; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; @@ -19,6 +22,10 @@ public class ItemMaintenanceFocus extends ItemBaseFocus { private static final AspectList visCost = new AspectList().add(Aspect.FIRE, 2500).add(Aspect.EARTH, 2500) .add(Aspect.ORDER, 2500); + private static final ResourceLocation focusMaintenanceSound = new ResourceLocation( + RESOURCE_PATH, + "maintenance.MaintenanceWandFocus"); + public ItemMaintenanceFocus() { super("maintenance"); } @@ -67,6 +74,7 @@ public class ItemMaintenanceFocus extends ItemBaseFocus { hatch.mSolderingTool = true; hatch.mWrench = true; hatch.mSoftMallet = true; + hatch.setMaintenanceSound(focusMaintenanceSound, 1.0F, 1.0F); } } } diff --git a/src/main/resources/assets/emt/sounds.json b/src/main/resources/assets/emt/sounds.json new file mode 100644 index 0000000..b17ebf1 --- /dev/null +++ b/src/main/resources/assets/emt/sounds.json @@ -0,0 +1,34 @@ +{ + "maintenance.MaintenanceWandFocus": { + "category": "block", + "sounds": [ + { + "name": "MaintenanceWandFocus", + "stream": false, + "licensing": { + "author_name": "Kynake", + "license_url": "https://creativecommons.org/licenses/by-sa/4.0/", + "license_name": "Attribution-ShareAlike 4.0", + "original_sound_urls": [ + "https://freesound.org/people/tgerginov/sounds/671175/", + "https://opengameart.org/content/68-workshop-sounds" + ], + "original_sound_names": [ + "671175__tgerginov__magic.wav", + "workshop - ratchet2.wav" + ], + "original_author_urls": [ + "https://freesound.org/people/tgerginov/", + "https://opengameart.org/users/bart" + ], + "original_author_names": [ + "tgerginov", + "bart" + ], + "original_license_url": "https://creativecommons.org/publicdomain/zero/1.0/", + "original_license_name": "CC0 1.0 Universal" + } + } + ] + } +} diff --git a/src/main/resources/assets/emt/sounds/MaintenanceWandFocus.ogg b/src/main/resources/assets/emt/sounds/MaintenanceWandFocus.ogg new file mode 100644 index 0000000..8c1e9b6 Binary files /dev/null and b/src/main/resources/assets/emt/sounds/MaintenanceWandFocus.ogg differ