Implement TFC knapping sounds

ACGaming · ACGaming · commit f5317851f64d · 2023-04-16T14:35:00.000+02:00
diff --git a/build.gradle b/build.gradle
@@ -65,8 +65,9 @@ repositories {
 
 dependencies {
     deobfCompile 'zone.rong:mixinbooter:7.0'
+    deobfCompile 'com.cleanroommc:assetmover:2.5'
     deobfCompile 'curse.maven:had-enough-items-557549:4109510'
-    deobfCompile 'com.cleanroommc:assetmover:2.4'
+    deobfCompile 'curse.maven:terrafirmacraft-302973:3645502'
 }
 
 mixin {
diff --git a/src/main/java/mod/acgaming/extrasounds/core/ESMixinLoader.java b/src/main/java/mod/acgaming/extrasounds/core/ESMixinLoader.java
@@ -1,8 +1,8 @@
 package mod.acgaming.extrasounds.core;
 
-import java.util.Collections;
 import java.util.List;
 
+import com.google.common.collect.Lists;
 import net.minecraftforge.fml.common.Loader;
 
 import zone.rong.mixinbooter.ILateMixinLoader;
@@ -12,17 +12,23 @@ public class ESMixinLoader implements ILateMixinLoader
     @Override
     public List<String> getMixinConfigs()
     {
-        return ESLoadingPlugin.isClient ? Collections.singletonList("extrasounds.jei.mixins.json") : Collections.singletonList("");
+        return Lists.newArrayList(
+            "extrasounds.jei.mixins.json",
+            "extrasounds.tfc.mixins.json"
+        );
     }
 
     @Override
     public boolean shouldMixinConfigQueue(String mixinConfig)
     {
         if (ESLoadingPlugin.isClient)
         {
-            if (mixinConfig.equals("extrasounds.jei.mixins.json"))
+            switch (mixinConfig)
             {
-                return Loader.isModLoaded("jei");
+                case "extrasounds.jei.mixins.json":
+                    return Loader.isModLoaded("jei");
+                case "extrasounds.tfc.mixins.json":
+                    return Loader.isModLoaded("tfc");
             }
         }
         return false;
diff --git a/src/main/java/mod/acgaming/extrasounds/mixin/client/GuiScreenMixin.java b/src/main/java/mod/acgaming/extrasounds/mixin/client/GuiScreenMixin.java
@@ -0,0 +1,27 @@
+package mod.acgaming.extrasounds.mixin.client;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraftforge.fml.common.Loader;
+
+import net.dries007.tfc.client.gui.GuiKnapping;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import zone.rong.mixinextras.injector.WrapWithCondition;
+
+@Mixin(GuiScreen.class)
+public class GuiScreenMixin
+{
+    @Shadow
+    public Minecraft mc;
+
+    @WrapWithCondition(method = "mouseClicked", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiButton;playPressSound(Lnet/minecraft/client/audio/SoundHandler;)V"))
+    public boolean esKnappingMouseClicked(GuiButton button, SoundHandler soundHandler)
+    {
+        if (!Loader.isModLoaded("tfc")) return true;
+        else return !(this.mc.currentScreen instanceof GuiKnapping);
+    }
+}
diff --git a/src/main/java/mod/acgaming/extrasounds/mixin/jei/IngredientGridWithNavigationMixin.java b/src/main/java/mod/acgaming/extrasounds/mixin/jei/IngredientGridWithNavigationMixin.java
@@ -1,4 +1,4 @@
-package mod.acgaming.extrasounds.mixin.client;
+package mod.acgaming.extrasounds.mixin.jei;
 
 import mezz.jei.gui.overlay.IngredientGridWithNavigation;
 import mezz.jei.input.IPaged;
diff --git a/src/main/java/mod/acgaming/extrasounds/mixin/tfc/GuiKnappingMixin.java b/src/main/java/mod/acgaming/extrasounds/mixin/tfc/GuiKnappingMixin.java
@@ -0,0 +1,43 @@
+package mod.acgaming.extrasounds.mixin.tfc;
+
+import net.minecraft.client.audio.SoundHandler;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.init.SoundEvents;
+
+import mod.acgaming.extrasounds.sound.client.ESSoundManagerClient;
+import net.dries007.tfc.api.recipes.knapping.KnappingType;
+import net.dries007.tfc.client.gui.GuiKnapping;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+@Mixin(value = GuiKnapping.class, remap = false)
+public class GuiKnappingMixin
+{
+    @Shadow
+    @Final
+    private KnappingType type;
+
+    @Redirect(method = "actionPerformed", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/GuiButton;playPressSound(Lnet/minecraft/client/audio/SoundHandler;)V"))
+    public void esKnappingPlayPressSound(GuiButton b1, SoundHandler soundHandler, GuiButton b2)
+    {
+        if (type.equals(KnappingType.CLAY) || type.equals(KnappingType.FIRE_CLAY))
+        {
+            ESSoundManagerClient.playSoundPlayer(SoundEvents.BLOCK_GRAVEL_BREAK, 1.2F, 0.8F);
+        }
+        else if (type.equals(KnappingType.STONE))
+        {
+            ESSoundManagerClient.playSoundPlayer(SoundEvents.BLOCK_STONE_BREAK, 2, 0.8F);
+        }
+        else if (type.equals(KnappingType.LEATHER))
+        {
+            ESSoundManagerClient.playSoundPlayer(SoundEvents.ITEM_ARMOR_EQUIP_LEATHER, 2, 0.8F);
+        }
+        else
+        {
+            ESSoundManagerClient.playSoundPlayer(SoundEvents.UI_BUTTON_CLICK, 1, 1);
+        }
+    }
+}
diff --git a/src/main/resources/extrasounds.client.mixins.json b/src/main/resources/extrasounds.client.mixins.json
@@ -3,5 +3,5 @@
   "refmap": "extrasounds.refmap.json",
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
-  "client": ["GuiContainerCreativeMixin", "GuiContainerMixin", "GuiInventoryMixin", "GuiNewChatMixin", "GuiRecipeBookMixin", "GuiScreenBookMixin", "GuiTextFieldMixin", "ItemDyeMixin", "MinecraftMixin"]
+  "client": ["GuiContainerCreativeMixin", "GuiContainerMixin", "GuiInventoryMixin", "GuiNewChatMixin", "GuiRecipeBookMixin", "GuiScreenBookMixin", "GuiScreenMixin", "GuiTextFieldMixin", "ItemDyeMixin", "MinecraftMixin"]
 }
diff --git a/src/main/resources/extrasounds.jei.mixins.json b/src/main/resources/extrasounds.jei.mixins.json
@@ -1,5 +1,5 @@
 {
-  "package": "mod.acgaming.extrasounds.mixin.client",
+  "package": "mod.acgaming.extrasounds.mixin.jei",
   "refmap": "extrasounds.refmap.json",
   "minVersion": "0.8",
   "compatibilityLevel": "JAVA_8",
diff --git a/src/main/resources/extrasounds.tfc.mixins.json b/src/main/resources/extrasounds.tfc.mixins.json
@@ -0,0 +1,7 @@
+{
+  "package": "mod.acgaming.extrasounds.mixin.tfc",
+  "refmap": "extrasounds.refmap.json",
+  "minVersion": "0.8",
+  "compatibilityLevel": "JAVA_8",
+  "client": ["GuiKnappingMixin"]
+}

Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,9 @@ repositories {`
`65`	`65`
`66`	`66`	`dependencies {`
`67`	`67`	`deobfCompile 'zone.rong:mixinbooter:7.0'`
	`68`	`+ deobfCompile 'com.cleanroommc:assetmover:2.5'`
`68`	`69`	`deobfCompile 'curse.maven:had-enough-items-557549:4109510'`
`69`		`- deobfCompile 'com.cleanroommc:assetmover:2.4'`
	`70`	`+ deobfCompile 'curse.maven:terrafirmacraft-302973:3645502'`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`mixin {`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package mod.acgaming.extrasounds.core;`
`2`	`2`
`3`		`-import java.util.Collections;`
`4`	`3`	`import java.util.List;`
`5`	`4`
	`5`	`+import com.google.common.collect.Lists;`
`6`	`6`	`import net.minecraftforge.fml.common.Loader;`
`7`	`7`
`8`	`8`	`import zone.rong.mixinbooter.ILateMixinLoader;`
`@@ -12,17 +12,23 @@ public class ESMixinLoader implements ILateMixinLoader`
`12`	`12`	`@Override`
`13`	`13`	`public List<String> getMixinConfigs()`
`14`	`14`	`{`
`15`		`- return ESLoadingPlugin.isClient ? Collections.singletonList("extrasounds.jei.mixins.json") : Collections.singletonList("");`
	`15`	`+ return Lists.newArrayList(`
	`16`	`+ "extrasounds.jei.mixins.json",`
	`17`	`+ "extrasounds.tfc.mixins.json"`
	`18`	`+ );`
`16`	`19`	`}`
`17`	`20`
`18`	`21`	`@Override`
`19`	`22`	`public boolean shouldMixinConfigQueue(String mixinConfig)`
`20`	`23`	`{`
`21`	`24`	`if (ESLoadingPlugin.isClient)`
`22`	`25`	`{`
`23`		`- if (mixinConfig.equals("extrasounds.jei.mixins.json"))`
	`26`	`+ switch (mixinConfig)`
`24`	`27`	`{`
`25`		`- return Loader.isModLoaded("jei");`
	`28`	`+ case "extrasounds.jei.mixins.json":`
	`29`	`+ return Loader.isModLoaded("jei");`
	`30`	`+ case "extrasounds.tfc.mixins.json":`
	`31`	`+ return Loader.isModLoaded("tfc");`
`26`	`32`	`}`
`27`	`33`	`}`
`28`	`34`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package mod.acgaming.extrasounds.mixin.client;`
	`1`	`+package mod.acgaming.extrasounds.mixin.jei;`
`2`	`2`
`3`	`3`	`import mezz.jei.gui.overlay.IngredientGridWithNavigation;`
`4`	`4`	`import mezz.jei.input.IPaged;`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`"refmap": "extrasounds.refmap.json",`
`4`	`4`	`"minVersion": "0.8",`
`5`	`5`	`"compatibilityLevel": "JAVA_8",`
`6`		`- "client": ["GuiContainerCreativeMixin", "GuiContainerMixin", "GuiInventoryMixin", "GuiNewChatMixin", "GuiRecipeBookMixin", "GuiScreenBookMixin", "GuiTextFieldMixin", "ItemDyeMixin", "MinecraftMixin"]`
	`6`	`+ "client": ["GuiContainerCreativeMixin", "GuiContainerMixin", "GuiInventoryMixin", "GuiNewChatMixin", "GuiRecipeBookMixin", "GuiScreenBookMixin", "GuiScreenMixin", "GuiTextFieldMixin", "ItemDyeMixin", "MinecraftMixin"]`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "package": "mod.acgaming.extrasounds.mixin.client",`
	`2`	`+ "package": "mod.acgaming.extrasounds.mixin.jei",`
`3`	`3`	`"refmap": "extrasounds.refmap.json",`
`4`	`4`	`"minVersion": "0.8",`
`5`	`5`	`"compatibilityLevel": "JAVA_8",`