clean up

KyaniteMods · Apr 2, 2024 · ddb6bf5 · ddb6bf5
1 parent 79aa68b
commit ddb6bf5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/main/java/com/kyanite/deeperdarker/DeeperDarker.java b/src/main/java/com/kyanite/deeperdarker/DeeperDarker.java
@@ -7,6 +7,7 @@
 import com.kyanite.deeperdarker.content.blocks.CrystallizedAmberBlock;
 import com.kyanite.deeperdarker.content.blocks.entity.CrystallizedAmberBlockEntity;
 import com.kyanite.deeperdarker.content.entities.*;
+import com.kyanite.deeperdarker.content.items.SculkTransmitterItem;
 import com.kyanite.deeperdarker.content.items.SoulElytraItem;
 import com.kyanite.deeperdarker.datagen.assets.DDBlockStateProvider;
 import com.kyanite.deeperdarker.datagen.assets.DDItemModelProvider;
@@ -231,7 +232,7 @@ public static void clientSetup(final FMLClientSetupEvent event) {
                 Sheets.addWoodType(DDBlocks.ECHO);
                 Sheets.addWoodType(DDBlocks.BLOOM);
                 ItemProperties.register(DDItems.SOUL_ELYTRA.get(), new ResourceLocation("broken"), (pStack, pLevel, pEntity, pSeed) -> SoulElytraItem.isFlyEnabled(pStack) ? 0 : 1);
-                ItemProperties.register(DDItems.SCULK_TRANSMITTER.get(), new ResourceLocation(MOD_ID, "linked"), (pStack, pLevel, pEntity, pSeed) -> pStack.hasTag() && pStack.getTag().contains("blockPos") ? 1 : 0);
+                ItemProperties.register(DDItems.SCULK_TRANSMITTER.get(), new ResourceLocation(MOD_ID, "linked"), (pStack, pLevel, pEntity, pSeed) -> SculkTransmitterItem.isLinked(pStack) ? 1 : 0);
                 ItemProperties.register(DDItems.SONOROUS_STAFF.get(), new ResourceLocation(MOD_ID, "charge"), (pStack, pLevel, pEntity, pSeed) -> pEntity != null && pEntity.getUseItem() == pStack ? (pStack.getUseDuration() - pEntity.getUseItemRemainingTicks()) / 668f : 0);
             });
 

diff --git a/src/main/java/com/kyanite/deeperdarker/mixin/VibrationListenerMixin.java b/src/main/java/com/kyanite/deeperdarker/mixin/VibrationListenerMixin.java
@@ -17,7 +17,7 @@
 @Mixin(VibrationSystem.Listener.class)
 public class VibrationListenerMixin {
     @Inject(method = "handleGameEvent", at = @At("HEAD"), cancellable = true)
-    public void handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Context context, Vec3 vec3, CallbackInfoReturnable<? super Boolean> cir) {
+    public void handleGameEvent(ServerLevel level, GameEvent event, GameEvent.Context context, Vec3 vec3, CallbackInfoReturnable<Boolean> cir) {
         if(context.sourceEntity() instanceof LivingEntity entity) {
             if(entity.getMobType().equals(DDMobType.SCULK)) cir.setReturnValue(false);
             if(entity.hasEffect(DDEffects.SCULK_AFFINITY.get())) cir.setReturnValue(false);

diff --git a/src/main/java/com/kyanite/deeperdarker/mixin/WardenMixin.java b/src/main/java/com/kyanite/deeperdarker/mixin/WardenMixin.java
@@ -26,7 +26,7 @@ public WardenMixin(EntityType<? extends Monster> pEntityType, Level pLevel) {
     }
 
     @Inject(method = "canTargetEntity", at = @At("HEAD"), cancellable = true)
-    public void canTargetEntity(Entity target, CallbackInfoReturnable<? super Boolean> cir) {
+    public void canTargetEntity(Entity target, CallbackInfoReturnable<Boolean> cir) {
         if(target instanceof LivingEntity entity && entity.getMobType() == DDMobType.SCULK) cir.setReturnValue(false);
     }
 }