Skip to content

Commit

Permalink
Follows 1.20.1 update
Browse files Browse the repository at this point in the history
  • Loading branch information
Mechalopa committed Feb 16, 2025
1 parent d93e134 commit ff6ecf2
Show file tree
Hide file tree
Showing 18 changed files with 380 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import java.util.function.Supplier;

import com.github.mechalopa.jafohana.JAFOhana;
import com.github.mechalopa.jafohana.world.level.block.CreepansyBlock;
import com.github.mechalopa.jafohana.world.level.block.CrimsonCloverBlock;
import com.github.mechalopa.jafohana.world.level.block.FasciatedDandelionBlock;
import com.github.mechalopa.jafohana.world.level.block.FasciatedOxeyeDaisyBlock;
Expand Down Expand Up @@ -46,7 +47,7 @@ public class ModBlocks
public static final Supplier<Block> PURPLE_PANSY = REGISTRY.register("purple_pansy", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9.0F));
public static final Supplier<Block> WHITE_PANSY = REGISTRY.register("white_pansy", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9.0F));
public static final Supplier<Block> YELLOW_PANSY = REGISTRY.register("yellow_pansy", () -> new ModFlowerBlock(MobEffects.CONFUSION, 9.0F));
public static final Supplier<Block> CREEPANSY = REGISTRY.register("creepansy", () -> new ModFlowerBlock(MobEffects.DAMAGE_BOOST, 4.0F));
public static final Supplier<Block> CREEPANSY = REGISTRY.register("creepansy", () -> new CreepansyBlock(MobEffects.DAMAGE_BOOST, 4.0F));
public static final Supplier<Block> SNOWDROP = REGISTRY.register("snowdrop", () -> new ModFlowerBlock(MobEffects.POISON, 12.0F));
public static final Supplier<Block> WINTER_HEATH = REGISTRY.register("winter_heath", () -> new ModFlowerBlock(MobEffects.WEAKNESS, 9.0F));
public static final Supplier<Block> BLUE_DAISY = REGISTRY.register("blue_daisy", () -> new ModFlowerBlock(MobEffects.MOVEMENT_SPEED, 5.0F));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public static final class BlockTags
public static final TagKey<Block> CONVERTABLE_TO_CREEPANSY = createBlockTag("convertable_to_creepansy");
public static final TagKey<Block> CONVERTABLE_TO_FASCIATED_DANDELION = createBlockTag("convertable_to_fasciated_dandelion");
public static final TagKey<Block> CONVERTABLE_TO_FASCIATED_OXEYE_DAISY = createBlockTag("convertable_to_fasciated_oxeye_daisy");
public static final TagKey<Block> CREEPANSY_PLANTABLE_ON = createBlockTag("creepansy_plantable_on");
public static final TagKey<Block> CRIMSON_CLOVER_PLANTABLE_ON = createBlockTag("crimson_clover_plantable_on");
public static final TagKey<Block> JADE_VINE_PLANTABLE_ON = createBlockTag("jade_vine_plantable_on");
public static final TagKey<Block> RED_SPIDER_LILY_PLANTABLE_ON = createBlockTag("red_spider_lily_plantable_on");
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.github.mechalopa.jafohana.world.level.block;

import com.github.mechalopa.jafohana.util.ModTags;

import net.minecraft.core.BlockPos;
import net.minecraft.core.Holder;
import net.minecraft.world.effect.MobEffect;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.block.state.BlockState;

public class CreepansyBlock extends ModFlowerBlock
{
public CreepansyBlock(Holder<MobEffect> effect, float seconds)
{
super(effect, seconds);
}

@Override
protected boolean mayPlaceOn(BlockState state, BlockGetter world, BlockPos pos)
{
return state.is(ModTags.BlockTags.CREEPANSY_PLANTABLE_ON);
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "neoforge:add_features",
"biomes": "#jafohana:has_creepansy",
"features": "jafohana:creepansy",
"step": "vegetal_decoration"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "neoforge:add_features",
"biomes": "#jafohana:has_fasciated_oxeye_daisy",
"features": "jafohana:fasciated_oxeye_daisy",
"step": "vegetal_decoration"
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@
{
"name": "#jafohana:biomesoplenty/tundra",
"negate": true
},
{
"name": "#jafohana:integrateddynamics/meneglin",
"negate": true
}
]
],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"type": "neoforge:add_features",
"biomes": "#jafohana:integrateddynamics/meneglin",
"features": "jafohana:flower_meneglin",
"step": "vegetal_decoration"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"replace": false,
"values": [
"#minecraft:dirt",
"minecraft:farmland",
{
"id": "#c:storage_blocks/gunpowder",
"required": false
},
{
"id": "#forge:storage_blocks/gunpowder",
"required": false
},
{
"id": "blasted_barrens:ashen_sand",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"replace": false,
"values": [
{
"id": "blasted_barrens:blasted_barrens",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"replace": false,
"values": [
"#jafohana:integrateddynamics/meneglin"
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"replace": false,
"values": [
{
"id": "integrateddynamics:meneglin",
"required": false
}
]
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"type": "minecraft:flower",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "jafohana:creepansy"
}
}
}
},
"placement": [
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
}
}
]
},
"tries": 32,
"xz_spread": 7,
"y_spread": 3
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "jafohana:fasciated_oxeye_daisy",
"Properties": {
"half": "lower"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
{
"type": "minecraft:simple_random_selector",
"config": {
"features": [
{
"feature": {
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "jafohana:bluebell"
}
}
}
},
"placement": [
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
}
}
]
},
"tries": 64,
"xz_spread": 7,
"y_spread": 3
}
},
"placement": []
},
{
"feature": {
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "jafohana:evening_primrose"
}
}
}
},
"placement": [
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
}
}
]
},
"tries": 64,
"xz_spread": 7,
"y_spread": 3
}
},
"placement": []
},
{
"feature": {
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "jafohana:forget_me_not"
}
}
}
},
"placement": [
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
}
}
]
},
"tries": 64,
"xz_spread": 7,
"y_spread": 3
}
},
"placement": []
},
{
"feature": {
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "jafohana:blue_daisy"
}
}
}
},
"placement": [
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
}
}
]
},
"tries": 64,
"xz_spread": 7,
"y_spread": 3
}
},
"placement": []
},
{
"feature": {
"type": "minecraft:random_patch",
"config": {
"feature": {
"feature": {
"type": "minecraft:simple_block",
"config": {
"to_place": {
"type": "minecraft:simple_state_provider",
"state": {
"Name": "jafohana:white_pansy"
}
}
}
},
"placement": [
{
"type": "minecraft:block_predicate_filter",
"predicate": {
"type": "minecraft:matching_blocks",
"blocks": "minecraft:air"
}
}
]
},
"tries": 64,
"xz_spread": 7,
"y_spread": 3
}
},
"placement": []
}
]
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"feature": "jafohana:creepansy",
"placement": [
{
"type": "minecraft:rarity_filter",
"chance": 16
},
{
"type": "minecraft:in_square"
},
{
"type": "minecraft:heightmap",
"heightmap": "MOTION_BLOCKING"
},
{
"type": "minecraft:biome"
}
]
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
{
"feature": "jafohana:fasciated_dandelion",
"placement": [
{
"type": "minecraft:count",
"count": {
"type": "minecraft:uniform",
"max_inclusive": 2,
"min_inclusive": 1
}
},
{
"type": "minecraft:rarity_filter",
"chance": 64
Expand Down
Loading

0 comments on commit ff6ecf2

Please sign in to comment.