🎨 improve coupling

TeamGensouSpark · Aug 23, 2023 · 3d001cd · 3d001cd
1 parent d00c69f
commit 3d001cd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/main/java/io/github/teamgensouspark/kekkai/capacity/KekkaiCapacities.java b/src/main/java/io/github/teamgensouspark/kekkai/capacity/KekkaiCapacities.java
@@ -5,8 +5,8 @@
 import javax.annotation.Nullable;
 
 import io.github.teamgensouspark.kekkai.enums.EnumTouhouCapacity;
+import io.github.teamgensouspark.kekkai.utils.KekkaiHelper;
 import net.katsstuff.teamnightclipse.danmakucore.capability.dancoredata.IDanmakuCoreData;
-import net.katsstuff.teamnightclipse.danmakucore.javastuff.TouhouHelper;
 import net.minecraft.entity.player.EntityPlayer;
 
 public class KekkaiCapacities {
@@ -17,11 +17,11 @@ public KekkaiCapacities(EntityPlayer player) {
     }
 
     public IDanmakuCoreData getDanmakuCoreData() {
-        return TouhouHelper.getDanmakuCoreData(player).orElseGet(null);
+        return KekkaiHelper.getDanmakuCoreData(player);
     }
 
     public KekkaiCapacities getSyncPlayer(Consumer<IDanmakuCoreData> consumer) {
-        TouhouHelper.changeAndSyncPlayerData(consumer, player);
+        KekkaiHelper.changeAndSyncPlayerData(consumer, player);
         return this;
     }
 

diff --git a/src/main/java/io/github/teamgensouspark/kekkai/utils/_KekkaiHelperJ.java b/src/main/java/io/github/teamgensouspark/kekkai/utils/_KekkaiHelperJ.java
@@ -6,6 +6,7 @@
 import net.katsstuff.teamnightclipse.danmakucore.javastuff.TouhouHelper;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraftforge.common.capabilities.ICapabilityProvider;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -23,4 +24,8 @@ public static void changeAndSyncEntityData(Consumer<IDanmakuCoreData> operator,
     public static void changeAndSyncPlayerData(Consumer<IDanmakuCoreData> operator, EntityPlayer target) {
         TouhouHelper.changeAndSyncPlayerData(operator, target);
     }
+
+    public static IDanmakuCoreData getDanmakuCoreData(ICapabilityProvider provider) {
+        return TouhouHelper.getDanmakuCoreData(provider).orElseGet(null);
+    }
 }