diff --git a/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java b/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java index a0d26341..07e58041 100644 --- a/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java +++ b/src/main/java/com/github/mechalopa/jafohana/registry/ModBlocks.java @@ -24,38 +24,38 @@ public class ModBlocks { private static final DeferredRegister REGISTRY = DeferredRegister.create(Registries.BLOCK, JAFOhana.MODID); - public static final Supplier DAYFLOWER = REGISTRY.register("dayflower", () -> new ModFlowerBlock(MobEffects.WATER_BREATHING, 5)); - public static final Supplier EVENING_PRIMROSE = REGISTRY.register("evening_primrose", () -> new ModFlowerBlock(MobEffects.NIGHT_VISION, 5)); - public static final Supplier MILK_VETCH = REGISTRY.register("milk_vetch", () -> new ModFlowerBlock(MobEffects.REGENERATION, 8)); - public static final Supplier FORGET_ME_NOT = REGISTRY.register("forget_me_not", () -> new ModFlowerBlock(MobEffects.INVISIBILITY, 8)); - public static final Supplier YELLOW_AFRICAN_DAISY = REGISTRY.register("yellow_african_daisy", () -> new ModFlowerBlock(MobEffects.DAMAGE_RESISTANCE, 4)); - public static final Supplier PINK_AFRICAN_DAISY = REGISTRY.register("pink_african_daisy", () -> new ModFlowerBlock(MobEffects.DAMAGE_RESISTANCE, 4)); - public static final Supplier WHITE_AFRICAN_DAISY = REGISTRY.register("white_african_daisy", () -> new ModFlowerBlock(MobEffects.DAMAGE_RESISTANCE, 4)); - public static final Supplier BLACK_TULIP = REGISTRY.register("black_tulip", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9)); - public static final Supplier GREEN_TULIP = REGISTRY.register("green_tulip", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9)); - public static final Supplier BLOOD_RED_IRIS = REGISTRY.register("blood_red_iris", () -> new ModFlowerBlock(MobEffects.POISON, 12)); - public static final Supplier BLUEBELL = REGISTRY.register("bluebell", () -> new ModFlowerBlock(MobEffects.REGENERATION, 8)); - public static final Supplier RED_SNAPDRAGON = REGISTRY.register("red_snapdragon", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4)); - public static final Supplier YELLOW_SNAPDRAGON = REGISTRY.register("yellow_snapdragon", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4)); - public static final Supplier PINK_SNAPDRAGON = REGISTRY.register("pink_snapdragon", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4)); - public static final Supplier WHITE_EGRET_ORCHID = REGISTRY.register("white_egret_orchid", () -> new ModFlowerBlock(MobEffects.SLOW_FALLING, 5)); - public static final Supplier ORANGE_SPIDER_LILY = REGISTRY.register("orange_spider_lily", () -> new ModFlowerBlock(MobEffects.POISON, 12)); - public static final Supplier DANCING_LADIES_GINGER = REGISTRY.register("dancing_ladies_ginger", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5)); - public static final Supplier FIREBALL_LILY = REGISTRY.register("fireball_lily", () -> new ModFlowerBlock(MobEffects.FIRE_RESISTANCE, 4)); - public static final Supplier SPATHIPHYLLUM = REGISTRY.register("spathiphyllum", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5)); - public static final Supplier PURPLE_PANSY = REGISTRY.register("purple_pansy", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9)); - public static final Supplier WHITE_PANSY = REGISTRY.register("white_pansy", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9)); - public static final Supplier YELLOW_PANSY = REGISTRY.register("yellow_pansy", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9)); - public static final Supplier CREEPANSY = REGISTRY.register("creepansy", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4)); - public static final Supplier SNOWDROP = REGISTRY.register("snowdrop", () -> new ModFlowerBlock(MobEffects.POISON, 12)); - public static final Supplier WINTER_HEATH = REGISTRY.register("winter_heath", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9)); - public static final Supplier BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5)); - public static final Supplier CRIMSON_CLOVER = REGISTRY.register("crimson_clover", () -> new CrimsonCloverBlock(MobEffects.FIRE_RESISTANCE, 4)); - public static final Supplier WHEEL_LILY = REGISTRY.register("wheel_lily", () -> new ModFlowerBlock(MobEffects.SATURATION, 7)); - public static final Supplier MAGENTA_SPOTTED_BELLFLOWER = REGISTRY.register("magenta_spotted_bellflower", () -> new ModFlowerBlock(MobEffects.NIGHT_VISION, 5)); - public static final Supplier WHITE_SPOTTED_BELLFLOWER = REGISTRY.register("white_spotted_bellflower", () -> new ModFlowerBlock(MobEffects.NIGHT_VISION, 5)); - public static final Supplier RED_SPIDER_LILY = REGISTRY.register("red_spider_lily", () -> new RedSpiderLilyBlock(MobEffects.POISON, 12)); - public static final Supplier BELLS_OF_IRELAND = REGISTRY.register("bells_of_ireland", () -> new MediumFlowerBlock(MobEffects.SATURATION, 7)); + public static final Supplier DAYFLOWER = REGISTRY.register("dayflower", () -> new ModFlowerBlock(MobEffects.WATER_BREATHING, 5.0F)); + public static final Supplier EVENING_PRIMROSE = REGISTRY.register("evening_primrose", () -> new ModFlowerBlock(MobEffects.NIGHT_VISION, 5.0F)); + public static final Supplier MILK_VETCH = REGISTRY.register("milk_vetch", () -> new ModFlowerBlock(MobEffects.REGENERATION, 8.0F)); + public static final Supplier FORGET_ME_NOT = REGISTRY.register("forget_me_not", () -> new ModFlowerBlock(MobEffects.INVISIBILITY, 8.0F)); + public static final Supplier YELLOW_AFRICAN_DAISY = REGISTRY.register("yellow_african_daisy", () -> new ModFlowerBlock(MobEffects.DAMAGE_RESISTANCE, 4.0F)); + public static final Supplier PINK_AFRICAN_DAISY = REGISTRY.register("pink_african_daisy", () -> new ModFlowerBlock(MobEffects.DAMAGE_RESISTANCE, 4.0F)); + public static final Supplier WHITE_AFRICAN_DAISY = REGISTRY.register("white_african_daisy", () -> new ModFlowerBlock(MobEffects.DAMAGE_RESISTANCE, 4.0F)); + public static final Supplier BLACK_TULIP = REGISTRY.register("black_tulip", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9.0F)); + public static final Supplier GREEN_TULIP = REGISTRY.register("green_tulip", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9.0F)); + public static final Supplier BLOOD_RED_IRIS = REGISTRY.register("blood_red_iris", () -> new ModFlowerBlock(MobEffects.POISON, 12.0F)); + public static final Supplier BLUEBELL = REGISTRY.register("bluebell", () -> new ModFlowerBlock(MobEffects.REGENERATION, 8.0F)); + public static final Supplier RED_SNAPDRAGON = REGISTRY.register("red_snapdragon", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4.0F)); + public static final Supplier YELLOW_SNAPDRAGON = REGISTRY.register("yellow_snapdragon", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4.0F)); + public static final Supplier PINK_SNAPDRAGON = REGISTRY.register("pink_snapdragon", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4.0F)); + public static final Supplier WHITE_EGRET_ORCHID = REGISTRY.register("white_egret_orchid", () -> new ModFlowerBlock(MobEffects.SLOW_FALLING, 5.0F)); + public static final Supplier ORANGE_SPIDER_LILY = REGISTRY.register("orange_spider_lily", () -> new ModFlowerBlock(MobEffects.POISON, 12.0F)); + public static final Supplier DANCING_LADIES_GINGER = REGISTRY.register("dancing_ladies_ginger", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5.0F)); + public static final Supplier FIREBALL_LILY = REGISTRY.register("fireball_lily", () -> new ModFlowerBlock(MobEffects.FIRE_RESISTANCE, 4.0F)); + public static final Supplier SPATHIPHYLLUM = REGISTRY.register("spathiphyllum", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5.0F)); + public static final Supplier PURPLE_PANSY = REGISTRY.register("purple_pansy", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9.0F)); + public static final Supplier WHITE_PANSY = REGISTRY.register("white_pansy", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9.0F)); + public static final Supplier YELLOW_PANSY = REGISTRY.register("yellow_pansy", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9.0F)); + public static final Supplier CREEPANSY = REGISTRY.register("creepansy", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4.0F)); + public static final Supplier SNOWDROP = REGISTRY.register("snowdrop", () -> new ModFlowerBlock(MobEffects.POISON, 12.0F)); + public static final Supplier WINTER_HEATH = REGISTRY.register("winter_heath", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9.0F)); + public static final Supplier BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5.0F)); + public static final Supplier CRIMSON_CLOVER = REGISTRY.register("crimson_clover", () -> new CrimsonCloverBlock(MobEffects.FIRE_RESISTANCE, 4.0F)); + public static final Supplier WHEEL_LILY = REGISTRY.register("wheel_lily", () -> new ModFlowerBlock(MobEffects.SATURATION, 0.35F)); + public static final Supplier MAGENTA_SPOTTED_BELLFLOWER = REGISTRY.register("magenta_spotted_bellflower", () -> new ModFlowerBlock(MobEffects.NIGHT_VISION, 5.0F)); + public static final Supplier WHITE_SPOTTED_BELLFLOWER = REGISTRY.register("white_spotted_bellflower", () -> new ModFlowerBlock(MobEffects.NIGHT_VISION, 5.0F)); + public static final Supplier RED_SPIDER_LILY = REGISTRY.register("red_spider_lily", () -> new RedSpiderLilyBlock(MobEffects.POISON, 12.0F)); + public static final Supplier BELLS_OF_IRELAND = REGISTRY.register("bells_of_ireland", () -> new MediumFlowerBlock(MobEffects.SATURATION, 0.35F)); public static final Supplier ORANGE_MARIGOLD = REGISTRY.register("orange_marigold", () -> new ModTallFlowerBlock()); public static final Supplier YELLOW_MARIGOLD = REGISTRY.register("yellow_marigold", () -> new ModTallFlowerBlock()); public static final Supplier GLORIOSA = REGISTRY.register("gloriosa", () -> new ModTallFlowerBlock()); diff --git a/src/main/java/com/github/mechalopa/jafohana/world/level/block/CrimsonCloverBlock.java b/src/main/java/com/github/mechalopa/jafohana/world/level/block/CrimsonCloverBlock.java index 44072b5a..80be73dd 100644 --- a/src/main/java/com/github/mechalopa/jafohana/world/level/block/CrimsonCloverBlock.java +++ b/src/main/java/com/github/mechalopa/jafohana/world/level/block/CrimsonCloverBlock.java @@ -23,9 +23,9 @@ public class CrimsonCloverBlock extends ModFlowerBlock { public static final BooleanProperty ON_NYLIUM = ModBlockStateProperties.ON_NYLIUM; - public CrimsonCloverBlock(Holder effect, int effectDuration) + public CrimsonCloverBlock(Holder effect, float seconds) { - super(effect, effectDuration); + super(effect, seconds); this.registerDefaultState(this.stateDefinition.any().setValue(ON_NYLIUM, false)); } diff --git a/src/main/java/com/github/mechalopa/jafohana/world/level/block/MediumFlowerBlock.java b/src/main/java/com/github/mechalopa/jafohana/world/level/block/MediumFlowerBlock.java index 201c98ef..301f1cf4 100644 --- a/src/main/java/com/github/mechalopa/jafohana/world/level/block/MediumFlowerBlock.java +++ b/src/main/java/com/github/mechalopa/jafohana/world/level/block/MediumFlowerBlock.java @@ -14,9 +14,9 @@ public class MediumFlowerBlock extends ModFlowerBlock { protected static final VoxelShape SHAPE = Block.box(5.0D, 0.0D, 5.0D, 11.0D, 14.0D, 11.0D); - public MediumFlowerBlock(Holder effect, int effectDuration) + public MediumFlowerBlock(Holder effect, float seconds) { - super(effect, effectDuration); + super(effect, seconds); } @Override diff --git a/src/main/java/com/github/mechalopa/jafohana/world/level/block/ModFlowerBlock.java b/src/main/java/com/github/mechalopa/jafohana/world/level/block/ModFlowerBlock.java index 928a3bc9..b64f0500 100644 --- a/src/main/java/com/github/mechalopa/jafohana/world/level/block/ModFlowerBlock.java +++ b/src/main/java/com/github/mechalopa/jafohana/world/level/block/ModFlowerBlock.java @@ -14,9 +14,9 @@ public class ModFlowerBlock extends FlowerBlock { - public ModFlowerBlock(Holder effect, int effectDuration) + public ModFlowerBlock(Holder effect, float seconds) { - super(effect, effectDuration, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY)); + super(effect, seconds, BlockBehaviour.Properties.of().mapColor(MapColor.PLANT).noCollission().instabreak().sound(SoundType.GRASS).offsetType(BlockBehaviour.OffsetType.XZ).pushReaction(PushReaction.DESTROY)); } public boolean isReallyFlammable(BlockState state, BlockGetter getter, BlockPos pos, Direction direction) diff --git a/src/main/java/com/github/mechalopa/jafohana/world/level/block/RedSpiderLilyBlock.java b/src/main/java/com/github/mechalopa/jafohana/world/level/block/RedSpiderLilyBlock.java index 3f519585..73c9fb3d 100644 --- a/src/main/java/com/github/mechalopa/jafohana/world/level/block/RedSpiderLilyBlock.java +++ b/src/main/java/com/github/mechalopa/jafohana/world/level/block/RedSpiderLilyBlock.java @@ -10,9 +10,9 @@ public class RedSpiderLilyBlock extends MediumFlowerBlock { - public RedSpiderLilyBlock(Holder effect, int effectDuration) + public RedSpiderLilyBlock(Holder effect, float seconds) { - super(effect, effectDuration); + super(effect, seconds); } @Override