Skip to content

Commit

Permalink
added wire cutter sound
Browse files Browse the repository at this point in the history
  • Loading branch information
Trinsdar committed Dec 9, 2024
1 parent 368312c commit b121b7b
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 2 deletions.
1 change: 1 addition & 0 deletions common/src/main/java/muramasa/antimatter/Ref.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ public class Ref {
**/
public static final SoundEvent DRILL = AntimatterAPI.register(SoundEvent.class, "drill", ID, new SoundEvent(new ResourceLocation(ID, "drill")));
public static final SoundEvent WRENCH = AntimatterAPI.register(SoundEvent.class, "wrench", ID, new SoundEvent(new ResourceLocation(ID, "wrench")));
public static final SoundEvent WIRE_CUTTERS = AntimatterAPI.register(SoundEvent.class, "wire-cutters", ID, new SoundEvent(new ResourceLocation(ID, "wire-cutters")));
public static final SoundEvent JOHN_CENA = AntimatterAPI.register(SoundEvent.class, "john-cena", ID, new SoundEvent(new ResourceLocation(ID, "john-cena")));
public static final SoundEvent INTERRUPT = AntimatterAPI.register(SoundEvent.class, "interrupt", ID, new SoundEvent(new ResourceLocation(ID, "interrupt")));
public static final SoundEvent MACHINE_EXPLODE = AntimatterAPI.register(SoundEvent.class, "machine-explode", ID, new SoundEvent(new ResourceLocation(ID, "machine-explode")));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public class AntimatterDefaultTools {
public static final AntimatterToolType SOFT_HAMMER = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "soft_hammer", 1, 2, 2, 1.0F, -3.0F, false)).setRepairable(false).setPrimaryRequirement(MaterialTags.RUBBERTOOLS);//.setUseSound();
public static final AntimatterToolType SCREWDRIVER = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "screwdriver", 1, 2, 2, 0.0F, -1.0F, false)).setUseSound(Ref.WRENCH).setRepairable(false).setMaterialTypeItem(SCREWDRIVER_TIP);
public static final AntimatterToolType MORTAR = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "mortar", 1, 5, 2, -2.0F, 0.0F, false)).setUseSound(SoundEvents.GRINDSTONE_USE).setBlockBreakability(false).setRepairable(false);
public static final AntimatterToolType WIRE_CUTTER = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "wire_cutter", 1, 3, 2, 0.0F, -1.5F, false)).setUseSound(SoundEvents.SHEEP_SHEAR).addEffectiveMaterials(WOOL, SPONGE, WEB, CLOTH_DECORATION).setRepairable(false).addBlacklistedEnchantments(Enchantments.BLOCK_EFFICIENCY);
public static final AntimatterToolType WIRE_CUTTER = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "wire_cutter", 1, 3, 2, 0.0F, -1.5F, false)).setUseSound(Ref.WIRE_CUTTERS).addEffectiveMaterials(WOOL, SPONGE, WEB, CLOTH_DECORATION).setRepairable(false).addBlacklistedEnchantments(Enchantments.BLOCK_EFFICIENCY);
public static final AntimatterToolType BRANCH_CUTTER = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "branch_cutter", 1, 3, 2, 0.0F, -1.5F, false)).addTags("grafter").addEffectiveMaterials(LEAVES).setHasContainer(false).setDurabilityMultiplier(0.25f);
public static final AntimatterToolType KNIFE = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "knife", 1, 2, 1, 2.1F, -2.0F, false)).addEffectiveBlocks(Blocks.COBWEB).setRepairable(false).setTag(new ResourceLocation(Ref.ID, "knives")).setOriginalTag(true);
public static final AntimatterToolType SCISSORS = AntimatterAPI.register(AntimatterToolType.class, new AntimatterToolType(Ref.ID, "scissors", 1, 2, 2, 1.0f, -1.5f, false));
Expand Down
6 changes: 5 additions & 1 deletion common/src/main/resources/assets/antimatter/sounds.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,16 @@
{
"wrench": {
"subtitle": "antimatter.subtitle.wrench",
"subtitle": "antimatter.subtitle.wrench",
"sounds": [ "antimatter:wrench" ]
},
"drill": {
"subtitle": "antimatter.subtitle.drill",
"sounds": [ "antimatter:drill" ]
},
"wire-cutters": {
"subtitle": "antimatter.subtitle.wire_cutters",
"sounds": [ "antimatter:wire-cutters" ]
},
"interrupt": {
"sounds": [ "antimatter:interrupt" ]
},
Expand Down
Binary file not shown.

0 comments on commit b121b7b

Please sign in to comment.