perform refactoring

Author: lonefelidae16

logics/src/main/java/dev/stashy/extrasounds/logics/SoundManager.java

@@ -1,6 +1,5 @@
 package dev.stashy.extrasounds.logics;
 
-import com.google.common.collect.Sets;
 import dev.stashy.extrasounds.logics.debug.DebugUtils;
 import dev.stashy.extrasounds.logics.entry.SoundPackLoader;
 import dev.stashy.extrasounds.logics.impl.VersionedHotbarSoundHandler;
@@ -27,6 +26,7 @@
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
@@ -48,7 +48,7 @@ public final class SoundManager {
 
     public SoundManager() {
         this.hotbarSoundHandler = VersionedHotbarSoundHandler.newInstance();
-        this.missingSoundId = Sets.newHashSet();
+        this.missingSoundId = new HashSet<>();
         this.lastPlayed = 0;
         this.quickMovingItem = Items.AIR;
     }

logics/src/main/java/dev/stashy/extrasounds/logics/VersionedMain.java

@@ -1,6 +1,5 @@
 package dev.stashy.extrasounds.logics;
 
-import com.google.common.collect.Maps;
 import dev.stashy.extrasounds.logics.impl.state.InventoryClickState;
 import dev.stashy.extrasounds.logics.runtime.VersionedSoundEventWrapper;
 import me.lonefelidae16.groominglib.Util;
@@ -14,6 +13,7 @@
 import net.minecraft.util.Identifier;
 import net.minecraft.util.collection.IndexedIterable;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Predicate;
 
@@ -33,7 +33,7 @@ public static VersionedMain newInstance() {
      * Predicate in this value will be passed an instance of an {@link InventoryClickState}.<br>
      * Item -&gt; Predicate&lt;InventoryClickStatus&gt;
      */
-    protected static final Map<Item, Predicate<InventoryClickState>> IGNORE_SOUND_PREDICATE_MAP = Util.make(Maps.newHashMap(), map -> {
+    protected static final Map<Item, Predicate<InventoryClickState>> IGNORE_SOUND_PREDICATE_MAP = Util.make(new HashMap<>(), map -> {
         map.put(Items.BUNDLE, status -> {
             return status.isRMB && !(status.slot instanceof CreativeInventoryScreen.LockableSlot);
         });

logics/src/main/java/dev/stashy/extrasounds/logics/entry/SoundPackLoader.java

@@ -1,6 +1,5 @@
 package dev.stashy.extrasounds.logics.entry;
 
-import com.google.common.collect.Sets;
 import com.google.gson.*;
 import dev.stashy.extrasounds.logics.ExtraSounds;
 import dev.stashy.extrasounds.logics.SoundManager;
@@ -153,7 +152,7 @@ public static void init() {
      */
     private static void processSounds(Map<String, SoundGenerator> soundGenerator, Map<String, SoundEntry> resource) {
         final SoundEntry fallbackSoundEntry = Sounds.aliased(SoundManager.FALLBACK_SOUND_EVENT);
-        final Set<String> inSoundsJsonIds = Sets.newHashSet();
+        final Set<String> inSoundsJsonIds = new HashSet<>();
         final String fallbackSoundJson = GSON.toJson(fallbackSoundEntry);
         if (DebugUtils.SEARCH_UNDEF_SOUND) {
             try (InputStream stream = SoundPackLoader.class.getClassLoader().getResourceAsStream("assets/%s/%s".formatted(ExtraSounds.MODID, SOUNDS_JSON_ID.getPath()))) {

logics/src/main/java/dev/stashy/extrasounds/logics/impl/AbstractInteractionHandler.java

@@ -2,6 +2,7 @@
 
 import dev.stashy.extrasounds.logics.ExtraSounds;
 import dev.stashy.extrasounds.logics.impl.state.ActionResultState;
+import dev.stashy.extrasounds.logics.mixin.access.FlowerPotBlockInvoker;
 import dev.stashy.extrasounds.sounds.Sounds;
 import net.minecraft.block.*;
 import net.minecraft.block.entity.BlockEntity;
@@ -100,7 +101,7 @@ public final void onUse(ClientPlayerEntity player, BlockPos blockPos, ActionResu
                 (this.block instanceof FlowerPotBlock potBlock) &&
                 actionResult == ActionResultState.SUCCESS
         ) {
-            if (!potBlock.isEmpty()) {
+            if (!((FlowerPotBlockInvoker) potBlock).invokeIsEmpty()) {
                 // Take from pot
                 ExtraSounds.MANAGER.blockInteract(potBlock.getContent().asItem(), blockPos);
             } else {

logics/src/main/java/dev/stashy/extrasounds/logics/mixin/access/FlowerPotBlockInvoker.java

@@ -0,0 +1,11 @@
+package dev.stashy.extrasounds.logics.mixin.access;
+
+import net.minecraft.block.FlowerPotBlock;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(FlowerPotBlock.class)
+public interface FlowerPotBlockInvoker {
+    @Invoker("isEmpty")
+    boolean invokeIsEmpty();
+}

…action/item/ClientPlayerEntityMixin.java …action/item/ClientPlayerEntityMixin.javaversioned/es1.20/src/main/java/dev/stashy/extrasounds/mc1_20/mixin/action/item/ClientPlayerEntityMixin.java renamed to logics/src/main/java/dev/stashy/extrasounds/logics/mixin/action/item/ClientPlayerEntityMixin.java versioned/es1.20/src/main/java/dev/stashy/extrasounds/mc1_20/mixin/action/item/ClientPlayerEntityMixin.java renamed to logics/src/main/java/dev/stashy/extrasounds/logics/mixin/action/item/ClientPlayerEntityMixin.java

@@ -1,4 +1,4 @@
-package dev.stashy.extrasounds.mc1_20.mixin.action.item;
+package dev.stashy.extrasounds.logics.mixin.action.item;
 
 import com.mojang.authlib.GameProfile;
 import dev.stashy.extrasounds.logics.ExtraSounds;

logics/src/main/resources/extrasounds.accesswidener

@@ -1,3 +1,2 @@
 accessWidener	v2	named
-accessible method net/minecraft/block/FlowerPotBlock isEmpty ()Z
 accessible class net/minecraft/client/gui/screen/ingame/CreativeInventoryScreen$LockableSlot

logics/src/main/resources/extrasounds.logics.mixins.json

@@ -4,7 +4,10 @@
   "package": "dev.stashy.extrasounds.logics.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
+    "access.FlowerPotBlockInvoker",
+
     "action.entity.LivingEntityMixin",
+    "action.item.ClientPlayerEntityMixin",
     "hotbar.MinecraftClientMixin",
     "inventory.ClientPlayerInteractionManagerMixin",
     "inventory.HandledScreenMixin",