Skip to content

Commit

Permalink
Fix again
Browse files Browse the repository at this point in the history
  • Loading branch information
jakeb072001 committed Jan 27, 2025
1 parent 33037b1 commit 5f70f9d
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 12 deletions.
4 changes: 3 additions & 1 deletion src/main/java/terramine/common/compat/HaemaCompat.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package terramine.common.compat;

import com.williambl.haema.api.VampireBurningEvents;
import net.fabricmc.fabric.api.util.TriState;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.level.Level;
Expand All @@ -9,8 +8,10 @@

public class HaemaCompat implements CompatHandler {


@Override
public void run() {
/**
VampireBurningEvents.INSTANCE.getVETO().register(new VampireBurningEvents.Veto() {
@NotNull
@Override
Expand All @@ -24,6 +25,7 @@ public int getPriority() {
return 20;
}
});
**/
}

@Override
Expand Down
10 changes: 2 additions & 8 deletions src/main/java/terramine/common/compat/OriginsCompat.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
package terramine.common.compat;

import io.github.apace100.apoli.registry.ApoliRegistries;
import io.github.apace100.origins.Origins;
import net.fabricmc.fabric.api.event.registry.RegistryEntryAddedCallback;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.entity.LivingEntity;
import terramine.common.item.equipment.UmbrellaItem;
import terramine.mixin.compat.origins.ConditionFactoryAccessor;

public class OriginsCompat implements CompatHandler {

@Override
public void run() {
/**
RegistryEntryAddedCallback.event(ApoliRegistries.ENTITY_CONDITION).register((rawId, id, conditionFactory) -> {
// Held-up umbrella blocks origins:exposed_to_sun condition
if (conditionFactory.getSerializerId().equals(ResourceLocation.fromNamespaceAndPath(Origins.MODID, "exposed_to_sun"))) {
Expand All @@ -23,6 +16,7 @@ public void run() {
&& !UmbrellaItem.isHeldUpInEitherHand(entity));
}
});
**/
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package terramine.mixin.compat.origins;

import io.github.apace100.apoli.power.factory.condition.ConditionFactory;
import io.github.apace100.calio.data.SerializableData;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Accessor;

import java.util.function.BiFunction;

/**
@Mixin(value = ConditionFactory.class, remap = false)
public interface ConditionFactoryAccessor<T> {
Expand All @@ -16,3 +15,4 @@ public interface ConditionFactoryAccessor<T> {
@Accessor
void setCondition(BiFunction<SerializableData.Instance, T, Boolean> condition);
}
**/
1 change: 0 additions & 1 deletion src/main/resources/terramine.mixins.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"blocks.DeadBushBlockMixin",
"blocks.SnowLayerBlockMixin",
"blocks.SugarCaneBlockMixin",
"compat.origins.ConditionFactoryAccessor",
"event.EnchantmentHelperMixin",
"event.LivingEntitiesMixin",
"event.LivingEntityMixin",
Expand Down

0 comments on commit 5f70f9d

Please sign in to comment.