From afb8281b5283d1cc90bae4c0630b9d9c1a4bf846 Mon Sep 17 00:00:00 2001 From: Maxx <53229958+MBatt1@users.noreply.github.com> Date: Wed, 18 Sep 2024 19:41:36 -0500 Subject: [PATCH] this sucks --- .../id/paradiselost/entities/ParadiseLostEntityTypes.java | 6 +++--- .../java/net/id/paradiselost/items/ParadiseLostItems.java | 5 ----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/id/paradiselost/entities/ParadiseLostEntityTypes.java b/src/main/java/net/id/paradiselost/entities/ParadiseLostEntityTypes.java index 4089ea4d3..c667c709c 100644 --- a/src/main/java/net/id/paradiselost/entities/ParadiseLostEntityTypes.java +++ b/src/main/java/net/id/paradiselost/entities/ParadiseLostEntityTypes.java @@ -49,16 +49,16 @@ private static Consumer> attributes(S return (entityType) -> FabricDefaultAttributeRegistry.register(entityType, builder.get()); } - private static Consumer> spawnRestrictions(SpawnRestriction.Location location, Heightmap.Type heightmapType, SpawnRestriction.SpawnPredicate predicate) { + private static Consumer> spawnRestrictions(SpawnLocation location, Heightmap.Type heightmapType, SpawnRestriction.SpawnPredicate predicate) { return (entityType) -> SpawnRestriction.register(entityType, location, heightmapType, predicate); } - private static Consumer> spawnRestrictions(SpawnRestriction.Location location, SpawnRestriction.SpawnPredicate predicate) { + private static Consumer> spawnRestrictions(SpawnLocation location, SpawnRestriction.SpawnPredicate predicate) { return spawnRestrictions(location, Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, predicate); } private static Consumer> spawnRestrictions(SpawnRestriction.SpawnPredicate predicate) { - return spawnRestrictions(SpawnRestriction.Location.ON_GROUND, Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, predicate); + return spawnRestrictions(SpawnLocationTypes.ON_GROUND, Heightmap.Type.MOTION_BLOCKING_NO_LEAVES, predicate); } public static void init() { diff --git a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java index 5fc64c37b..5503e4e8a 100644 --- a/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java +++ b/src/main/java/net/id/paradiselost/items/ParadiseLostItems.java @@ -1,7 +1,6 @@ package net.id.paradiselost.items; import com.chocohead.mm.api.ClassTinkerers; -import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.id.paradiselost.blocks.ParadiseLostBlocks; import net.id.paradiselost.entities.ParadiseLostEntityTypes; import net.id.paradiselost.items.armor.ParadiseLostArmorMaterials; @@ -48,10 +47,6 @@ public class ParadiseLostItems { Begin items */ - private static FabricItemSettings nightmare() { - return new FabricItemSettings().fireproof(); - } - private static Settings resource() { return new Settings(); }