MinecraftMods/BetterEnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Some small changes

Browse source
This commit is contained in:
paulevsGitch 2021-07-19 05:53:30 +03:00
parent 1342326e70
commit 55f7a858a6
11 changed files with 78 additions and 617 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gradle.properties
View file

@ -6,13 +6,13 @@ minecraft_version=1.17.1
yarn_mappings=6
loader_version=0.11.6
# Mod Properties
mod_version=0.10.4-pre
mod_version=0.10.5-pre
maven_group=ru.betterend
archives_base_name=better-end
# Dependencies
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
patchouli_version = 55-FABRIC-SNAPSHOT
fabric_version = 0.36.1+1.17
bclib_version = 0.2.2
bclib_version = 0.2.3
rei_version = 6.0.264-alpha
canvas_version = 1.0.+

14
src/main/java/ru/betterend/blocks/AncientEmeraldIceBlock.java
View file

@ -3,14 +3,22 @@ package ru.betterend.blocks;
import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.Mth;
import net.minecraft.world.entity.Entity;
import net.minecraft.world.entity.LivingEntity;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraft.world.item.enchantment.Enchantments;
import net.minecraft.world.level.GameRules;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import net.minecraft.world.phys.Vec3;
import ru.bclib.blocks.BaseBlock;
import ru.bclib.util.BlocksHelper;
import ru.bclib.util.MHelper;
@ -67,4 +75,10 @@ public class AncientEmeraldIceBlock extends BaseBlock {
return Collections.emptyList();
}
}
@Override
public void stepOn(Level level, BlockPos blockPos, BlockState blockState, Entity entity) {
super.stepOn(level, blockPos, blockState, entity);
entity.setIsInPowderSnow(true);
}
}

2
src/main/java/ru/betterend/util/ShuffelingListExtended.java → src/main/java/ru/betterend/interfaces/ShuffelingListExtended.java
View file

@ -1,4 +1,4 @@
package ru.betterend.util;
package ru.betterend.interfaces;
public interface ShuffelingListExtended<U> {
public boolean isEmpty();

593
src/main/java/ru/betterend/minigTools.txt
View file

@ -1,593 +0,0 @@
SHOVELS:
"betterend:endstone_dust",
HOES:
"betterend:amber_root_seed",
"betterend:blossom_berry_seed",
"betterend:chorus_mushroom_seed",
"betterend:dragon_tree_leaves",
"betterend:lacugrove_leaves",
"betterend:lucernia_leaves",
"betterend:pythadendron_leaves",
"betterend:shadow_berry",
"betterend:tenanea_leaves",
SWORDS:
AXES:
"betterend:amaranita_cap",
"betterend:amaranita_hymenophore",
"betterend:amaranita_lantern",
"betterend:aurant_polypore",
"betterend:blue_vine_lantern",
"betterend:filalux_lantern",
"betterend:hydralux_petal_block",
"betterend:hydralux_petal_block_black",
"betterend:hydralux_petal_block_blue",
"betterend:hydralux_petal_block_brown",
"betterend:hydralux_petal_block_cyan",
"betterend:hydralux_petal_block_gray",
"betterend:hydralux_petal_block_green",
"betterend:hydralux_petal_block_light_blue",
"betterend:hydralux_petal_block_light_gray",
"betterend:hydralux_petal_block_lime",
"betterend:hydralux_petal_block_magenta",
"betterend:hydralux_petal_block_orange",
"betterend:hydralux_petal_block_pink",
"betterend:hydralux_petal_block_purple",
"betterend:hydralux_petal_block_red",
"betterend:hydralux_petal_block_white",
"betterend:hydralux_petal_block_yellow",
"betterend:mossy_glowshroom_cap",
"betterend:mossy_glowshroom_hymenophore",
"betterend:purple_polypore",
SHEARS:
"betterend:aeridium",
"betterend:amaranita_fur",
"betterend:amber_grass",
"betterend:blooming_cooksonia",
"betterend:blue_vine_fur",
"betterend:blue_vine_seed",
"betterend:bolux_mushroom",
"betterend:bubble_coral",
"betterend:bulb_moss",
"betterend:bulb_vine",
"betterend:bulb_vine_seed",
"betterend:bushy_grass",
"betterend:cave_grass",
"betterend:cave_pumpkin_seed",
"betterend:charnia_cyan",
"betterend:charnia_green",
"betterend:charnia_light_blue",
"betterend:charnia_orange",
"betterend:charnia_purple",
"betterend:charnia_red",
"betterend:chorus_grass",
"betterend:clawfern",
"betterend:creeping_moss",
"betterend:crystal_grass",
"betterend:cyan_moss",
"betterend:dense_vine",
"betterend:dragon_tree_leaves",
"betterend:end_lily_seed",
"betterend:end_lotus_seed",
"betterend:filalux",
"betterend:filalux_wings",
"betterend:flamaea",
"betterend:fracturn",
"betterend:globulagus",
"betterend:glowing_pillar_leaves",
"betterend:glowing_pillar_luminophor",
"betterend:glowing_pillar_seed",
"betterend:helix_tree_leaves",
"betterend:hydralux_sapling",
"betterend:jungle_fern",
"betterend:jungle_grass",
"betterend:jungle_vine",
"betterend:lacugrove_leaves",
"betterend:lamellarium",
"betterend:lanceleaf_seed",
"betterend:lucernia_leaves",
"betterend:lucernia_outer_leaves",
"betterend:lumecorn_seed",
"betterend:lutebus",
"betterend:magnula",
"betterend:mossy_glowshroom_fur",
"betterend:murkweed",
"betterend:needlegrass",
"betterend:orango",
"betterend:pond_anemone",
"betterend:pythadendron_leaves",
"betterend:rubinea",
"betterend:ruscus",
"betterend:salteago",
"betterend:shadow_plant",
"betterend:small_amaranita_mushroom",
"betterend:small_jellyshroom",
"betterend:tail_moss",
"betterend:tenanea_flowers",
"betterend:tenanea_leaves",
"betterend:tenanea_outer_leaves",
"betterend:tube_worm",
"betterend:twisted_moss",
"betterend:twisted_umbrella_moss",
"betterend:twisted_umbrella_moss_tall",
"betterend:twisted_vine",
"betterend:umbrella_moss",
"betterend:umbrella_moss_tall",
"betterend:vaiolush_fern",
UNKNOWN:
"betterend:aurora_crystal",
MISSING:
"betterend:amber_ore",
"betterend:end_stone_stalactite",
"betterend:end_stone_stalactite_cavemoss",
"betterend:ender_ore",
NONE:
"betterend:amaranita_hyphae",
"betterend:amaranita_stem",
"betterend:ancient_emerald_ice",
"betterend:cave_bush",
"betterend:cave_pumpkin",
"betterend:dense_emerald_ice",
"betterend:dense_snow",
"betterend:dragon_tree_bark",
"betterend:dragon_tree_barrel",
"betterend:dragon_tree_bookshelf",
"betterend:dragon_tree_button",
"betterend:dragon_tree_chest",
"betterend:dragon_tree_composter",
"betterend:dragon_tree_crafting_table",
"betterend:dragon_tree_door",
"betterend:dragon_tree_fence",
"betterend:dragon_tree_gate",
"betterend:dragon_tree_ladder",
"betterend:dragon_tree_log",
"betterend:dragon_tree_planks",
"betterend:dragon_tree_plate",
"betterend:dragon_tree_sign",
"betterend:dragon_tree_slab",
"betterend:dragon_tree_stairs",
"betterend:dragon_tree_stripped_bark",
"betterend:dragon_tree_stripped_log",
"betterend:dragon_tree_trapdoor",
"betterend:emerald_ice",
"betterend:end_lotus_bark",
"betterend:end_lotus_barrel",
"betterend:end_lotus_bookshelf",
"betterend:end_lotus_button",
"betterend:end_lotus_chest",
"betterend:end_lotus_composter",
"betterend:end_lotus_crafting_table",
"betterend:end_lotus_door",
"betterend:end_lotus_fence",
"betterend:end_lotus_gate",
"betterend:end_lotus_ladder",
"betterend:end_lotus_log",
"betterend:end_lotus_planks",
"betterend:end_lotus_plate",
"betterend:end_lotus_sign",
"betterend:end_lotus_slab",
"betterend:end_lotus_stairs",
"betterend:end_lotus_stem",
"betterend:end_lotus_stripped_bark",
"betterend:end_lotus_stripped_log",
"betterend:end_lotus_trapdoor",
"betterend:helix_tree_bark",
"betterend:helix_tree_barrel",
"betterend:helix_tree_bookshelf",
"betterend:helix_tree_button",
"betterend:helix_tree_chest",
"betterend:helix_tree_composter",
"betterend:helix_tree_crafting_table",
"betterend:helix_tree_door",
"betterend:helix_tree_fence",
"betterend:helix_tree_gate",
"betterend:helix_tree_ladder",
"betterend:helix_tree_log",
"betterend:helix_tree_planks",
"betterend:helix_tree_plate",
"betterend:helix_tree_sign",
"betterend:helix_tree_slab",
"betterend:helix_tree_stairs",
"betterend:helix_tree_stripped_bark",
"betterend:helix_tree_stripped_log",
"betterend:helix_tree_trapdoor",
"betterend:jellyshroom_bark",
"betterend:jellyshroom_barrel",
"betterend:jellyshroom_bookshelf",
"betterend:jellyshroom_button",
"betterend:jellyshroom_cap_purple",
"betterend:jellyshroom_chest",
"betterend:jellyshroom_composter",
"betterend:jellyshroom_crafting_table",
"betterend:jellyshroom_door",
"betterend:jellyshroom_fence",
"betterend:jellyshroom_gate",
"betterend:jellyshroom_ladder",
"betterend:jellyshroom_log",
"betterend:jellyshroom_planks",
"betterend:jellyshroom_plate",
"betterend:jellyshroom_sign",
"betterend:jellyshroom_slab",
"betterend:jellyshroom_stairs",
"betterend:jellyshroom_stripped_bark",
"betterend:jellyshroom_stripped_log",
"betterend:jellyshroom_trapdoor",
"betterend:lacugrove_bark",
"betterend:lacugrove_barrel",
"betterend:lacugrove_bookshelf",
"betterend:lacugrove_button",
"betterend:lacugrove_chest",
"betterend:lacugrove_composter",
"betterend:lacugrove_crafting_table",
"betterend:lacugrove_door",
"betterend:lacugrove_fence",
"betterend:lacugrove_gate",
"betterend:lacugrove_ladder",
"betterend:lacugrove_log",
"betterend:lacugrove_planks",
"betterend:lacugrove_plate",
"betterend:lacugrove_sign",
"betterend:lacugrove_slab",
"betterend:lacugrove_stairs",
"betterend:lacugrove_stripped_bark",
"betterend:lacugrove_stripped_log",
"betterend:lacugrove_trapdoor",
"betterend:lucernia_bark",
"betterend:lucernia_barrel",
"betterend:lucernia_bookshelf",
"betterend:lucernia_button",
"betterend:lucernia_chest",
"betterend:lucernia_composter",
"betterend:lucernia_crafting_table",
"betterend:lucernia_door",
"betterend:lucernia_fence",
"betterend:lucernia_gate",
"betterend:lucernia_ladder",
"betterend:lucernia_log",
"betterend:lucernia_planks",
"betterend:lucernia_plate",
"betterend:lucernia_sign",
"betterend:lucernia_slab",
"betterend:lucernia_stairs",
"betterend:lucernia_stripped_bark",
"betterend:lucernia_stripped_log",
"betterend:lucernia_trapdoor",
"betterend:menger_sponge",
"betterend:menger_sponge_wet",
"betterend:mossy_glowshroom_bark",
"betterend:mossy_glowshroom_barrel",
"betterend:mossy_glowshroom_bookshelf",
"betterend:mossy_glowshroom_button",
"betterend:mossy_glowshroom_chest",
"betterend:mossy_glowshroom_composter",
"betterend:mossy_glowshroom_crafting_table",
"betterend:mossy_glowshroom_door",
"betterend:mossy_glowshroom_fence",
"betterend:mossy_glowshroom_gate",
"betterend:mossy_glowshroom_ladder",
"betterend:mossy_glowshroom_log",
"betterend:mossy_glowshroom_planks",
"betterend:mossy_glowshroom_plate",
"betterend:mossy_glowshroom_sign",
"betterend:mossy_glowshroom_slab",
"betterend:mossy_glowshroom_stairs",
"betterend:mossy_glowshroom_stripped_bark",
"betterend:mossy_glowshroom_stripped_log",
"betterend:mossy_glowshroom_trapdoor",
"betterend:neon_cactus",
"betterend:neon_cactus_block",
"betterend:neon_cactus_slab",
"betterend:neon_cactus_stairs",
"betterend:pythadendron_bark",
"betterend:pythadendron_barrel",
"betterend:pythadendron_bookshelf",
"betterend:pythadendron_button",
"betterend:pythadendron_chest",
"betterend:pythadendron_composter",
"betterend:pythadendron_crafting_table",
"betterend:pythadendron_door",
"betterend:pythadendron_fence",
"betterend:pythadendron_gate",
"betterend:pythadendron_ladder",
"betterend:pythadendron_log",
"betterend:pythadendron_planks",
"betterend:pythadendron_plate",
"betterend:pythadendron_sign",
"betterend:pythadendron_slab",
"betterend:pythadendron_stairs",
"betterend:pythadendron_stripped_bark",
"betterend:pythadendron_stripped_log",
"betterend:pythadendron_trapdoor",
"betterend:silk_moth_nest",
"betterend:tenanea_bark",
"betterend:tenanea_barrel",
"betterend:tenanea_bookshelf",
"betterend:tenanea_button",
"betterend:tenanea_chest",
"betterend:tenanea_composter",
"betterend:tenanea_crafting_table",
"betterend:tenanea_door",
"betterend:tenanea_fence",
"betterend:tenanea_gate",
"betterend:tenanea_ladder",
"betterend:tenanea_log",
"betterend:tenanea_planks",
"betterend:tenanea_plate",
"betterend:tenanea_sign",
"betterend:tenanea_slab",
"betterend:tenanea_stairs",
"betterend:tenanea_stripped_bark",
"betterend:tenanea_stripped_log",
"betterend:tenanea_trapdoor",
"betterend:umbrella_tree_bark",
"betterend:umbrella_tree_barrel",
"betterend:umbrella_tree_bookshelf",
"betterend:umbrella_tree_button",
"betterend:umbrella_tree_chest",
"betterend:umbrella_tree_cluster",
"betterend:umbrella_tree_cluster_empty",
"betterend:umbrella_tree_composter",
"betterend:umbrella_tree_crafting_table",
"betterend:umbrella_tree_door",
"betterend:umbrella_tree_fence",
"betterend:umbrella_tree_gate",
"betterend:umbrella_tree_ladder",
"betterend:umbrella_tree_log",
"betterend:umbrella_tree_membrane",
"betterend:umbrella_tree_planks",
"betterend:umbrella_tree_plate",
"betterend:umbrella_tree_sign",
"betterend:umbrella_tree_slab",
"betterend:umbrella_tree_stairs",
"betterend:umbrella_tree_stripped_bark",
"betterend:umbrella_tree_stripped_log",
"betterend:umbrella_tree_trapdoor",
PICKAXES:
"betterend:aeternium_anvil",
"betterend:aeternium_block",
"betterend:amber_block",
"betterend:amber_moss",
"betterend:amber_moss_path",
"betterend:andesite_lantern",
"betterend:andesite_pedestal",
"betterend:aurora_crystal",
"betterend:azure_jadestone",
"betterend:azure_jadestone_bricks",
"betterend:azure_jadestone_bricks_slab",
"betterend:azure_jadestone_bricks_stairs",
"betterend:azure_jadestone_bricks_wall",
"betterend:azure_jadestone_button",
"betterend:azure_jadestone_furnace",
"betterend:azure_jadestone_lantern",
"betterend:azure_jadestone_pedestal",
"betterend:azure_jadestone_pillar",
"betterend:azure_jadestone_plate",
"betterend:azure_jadestone_polished",
"betterend:azure_jadestone_slab",
"betterend:azure_jadestone_stairs",
"betterend:azure_jadestone_tiles",
"betterend:azure_jadestone_wall",
"betterend:blackstone_lantern",
"betterend:brimstone",
"betterend:cave_moss",
"betterend:cave_moss_path",
"betterend:charcoal_block",
"betterend:chorus_nylium",
"betterend:chorus_nylium_path",
"betterend:crystal_moss",
"betterend:crystal_moss_path",
"betterend:diorite_lantern",
"betterend:diorite_pedestal",
"betterend:dragon_bone_block",
"betterend:dragon_bone_slab",
"betterend:dragon_bone_stairs",
"betterend:end_moss",
"betterend:end_moss_path",
"betterend:end_mycelium",
"betterend:end_mycelium_path",
"betterend:end_stone_furnace",
"betterend:end_stone_lantern",
"betterend:end_stone_smelter",
"betterend:ender_block",
"betterend:eternal_pedestal",
"betterend:flavolite",
"betterend:flavolite_bricks",
"betterend:flavolite_bricks_slab",
"betterend:flavolite_bricks_stairs",
"betterend:flavolite_bricks_wall",
"betterend:flavolite_button",
"betterend:flavolite_furnace",
"betterend:flavolite_lantern",
"betterend:flavolite_pedestal",
"betterend:flavolite_pillar",
"betterend:flavolite_plate",
"betterend:flavolite_polished",
"betterend:flavolite_runed",
"betterend:flavolite_runed_eternal",
"betterend:flavolite_slab",
"betterend:flavolite_stairs",
"betterend:flavolite_tiles",
"betterend:flavolite_wall",
"betterend:gold_chandelier",
"betterend:granite_lantern",
"betterend:granite_pedestal",
"betterend:hydrothermal_vent",
"betterend:infusion_pedestal",
"betterend:iron_bulb_lantern",
"betterend:iron_bulb_lantern_black",
"betterend:iron_bulb_lantern_blue",
"betterend:iron_bulb_lantern_brown",
"betterend:iron_bulb_lantern_cyan",
"betterend:iron_bulb_lantern_gray",
"betterend:iron_bulb_lantern_green",
"betterend:iron_bulb_lantern_light_blue",
"betterend:iron_bulb_lantern_light_gray",
"betterend:iron_bulb_lantern_lime",
"betterend:iron_bulb_lantern_magenta",
"betterend:iron_bulb_lantern_orange",
"betterend:iron_bulb_lantern_pink",
"betterend:iron_bulb_lantern_purple",
"betterend:iron_bulb_lantern_red",
"betterend:iron_bulb_lantern_white",
"betterend:iron_bulb_lantern_yellow",
"betterend:iron_chandelier",
"betterend:jungle_moss",
"betterend:jungle_moss_path",
"betterend:missing_tile",
"betterend:mossy_dragon_bone",
"betterend:mossy_obsidian",
"betterend:pink_moss",
"betterend:pink_moss_path",
"betterend:purpur_lantern",
"betterend:purpur_pedestal",
"betterend:quartz_lantern",
"betterend:quartz_pedestal",
"betterend:respawn_obelisk",
"betterend:rutiscus",
"betterend:rutiscus_path",
"betterend:sandy_jadestone",
"betterend:sandy_jadestone_bricks",
"betterend:sandy_jadestone_bricks_slab",
"betterend:sandy_jadestone_bricks_stairs",
"betterend:sandy_jadestone_bricks_wall",
"betterend:sandy_jadestone_button",
"betterend:sandy_jadestone_furnace",
"betterend:sandy_jadestone_lantern",
"betterend:sandy_jadestone_pedestal",
"betterend:sandy_jadestone_pillar",
"betterend:sandy_jadestone_plate",
"betterend:sandy_jadestone_polished",
"betterend:sandy_jadestone_slab",
"betterend:sandy_jadestone_stairs",
"betterend:sandy_jadestone_tiles",
"betterend:sandy_jadestone_wall",
"betterend:sangnum",
"betterend:sangnum_path",
"betterend:shadow_grass",
"betterend:shadow_grass_path",
"betterend:smaragdant_crystal",
"betterend:smaragdant_crystal_bricks",
"betterend:smaragdant_crystal_bricks_slab",
"betterend:smaragdant_crystal_bricks_stairs",
"betterend:smaragdant_crystal_bricks_wall",
"betterend:smaragdant_crystal_pedestal",
"betterend:smaragdant_crystal_pillar",
"betterend:smaragdant_crystal_polished",
"betterend:smaragdant_crystal_shard",
"betterend:smaragdant_crystal_slab",
"betterend:smaragdant_crystal_stairs",
"betterend:smaragdant_crystal_tiles",
"betterend:smaragdant_crystal_wall",
"betterend:sulphur_crystal",
"betterend:sulphuric_rock",
"betterend:sulphuric_rock_bricks",
"betterend:sulphuric_rock_bricks_slab",
"betterend:sulphuric_rock_bricks_stairs",
"betterend:sulphuric_rock_bricks_wall",
"betterend:sulphuric_rock_button",
"betterend:sulphuric_rock_furnace",
"betterend:sulphuric_rock_lantern",
"betterend:sulphuric_rock_pedestal",
"betterend:sulphuric_rock_pillar",
"betterend:sulphuric_rock_plate",
"betterend:sulphuric_rock_polished",
"betterend:sulphuric_rock_slab",
"betterend:sulphuric_rock_stairs",
"betterend:sulphuric_rock_tiles",
"betterend:sulphuric_rock_wall",
"betterend:terminite_anvil",
"betterend:terminite_bars",
"betterend:terminite_block",
"betterend:terminite_bulb_lantern",
"betterend:terminite_bulb_lantern_black",
"betterend:terminite_bulb_lantern_blue",
"betterend:terminite_bulb_lantern_brown",
"betterend:terminite_bulb_lantern_cyan",
"betterend:terminite_bulb_lantern_gray",
"betterend:terminite_bulb_lantern_green",
"betterend:terminite_bulb_lantern_light_blue",
"betterend:terminite_bulb_lantern_light_gray",
"betterend:terminite_bulb_lantern_lime",
"betterend:terminite_bulb_lantern_magenta",
"betterend:terminite_bulb_lantern_orange",
"betterend:terminite_bulb_lantern_pink",
"betterend:terminite_bulb_lantern_purple",
"betterend:terminite_bulb_lantern_red",
"betterend:terminite_bulb_lantern_white",
"betterend:terminite_bulb_lantern_yellow",
"betterend:terminite_chain",
"betterend:terminite_chandelier",
"betterend:terminite_door",
"betterend:terminite_plate",
"betterend:terminite_slab",
"betterend:terminite_stairs",
"betterend:terminite_tile",
"betterend:terminite_trapdoor",
"betterend:thallasium_anvil",
"betterend:thallasium_bars",
"betterend:thallasium_block",
"betterend:thallasium_bulb_lantern",
"betterend:thallasium_bulb_lantern_black",
"betterend:thallasium_bulb_lantern_blue",
"betterend:thallasium_bulb_lantern_brown",
"betterend:thallasium_bulb_lantern_cyan",
"betterend:thallasium_bulb_lantern_gray",
"betterend:thallasium_bulb_lantern_green",
"betterend:thallasium_bulb_lantern_light_blue",
"betterend:thallasium_bulb_lantern_light_gray",
"betterend:thallasium_bulb_lantern_lime",
"betterend:thallasium_bulb_lantern_magenta",
"betterend:thallasium_bulb_lantern_orange",
"betterend:thallasium_bulb_lantern_pink",
"betterend:thallasium_bulb_lantern_purple",
"betterend:thallasium_bulb_lantern_red",
"betterend:thallasium_bulb_lantern_white",
"betterend:thallasium_bulb_lantern_yellow",
"betterend:thallasium_chain",
"betterend:thallasium_chandelier",
"betterend:thallasium_door",
"betterend:thallasium_ore",
"betterend:thallasium_plate",
"betterend:thallasium_slab",
"betterend:thallasium_stairs",
"betterend:thallasium_tile",
"betterend:thallasium_trapdoor",
"betterend:violecite",
"betterend:violecite_bricks",
"betterend:violecite_bricks_slab",
"betterend:violecite_bricks_stairs",
"betterend:violecite_bricks_wall",
"betterend:violecite_button",
"betterend:violecite_furnace",
"betterend:violecite_lantern",
"betterend:violecite_pedestal",
"betterend:violecite_pillar",
"betterend:violecite_plate",
"betterend:violecite_polished",
"betterend:violecite_slab",
"betterend:violecite_stairs",
"betterend:violecite_tiles",
"betterend:violecite_wall",
"betterend:virid_jadestone",
"betterend:virid_jadestone_bricks",
"betterend:virid_jadestone_bricks_slab",
"betterend:virid_jadestone_bricks_stairs",
"betterend:virid_jadestone_bricks_wall",
"betterend:virid_jadestone_button",
"betterend:virid_jadestone_furnace",
"betterend:virid_jadestone_lantern",
"betterend:virid_jadestone_pedestal",
"betterend:virid_jadestone_pillar",
"betterend:virid_jadestone_plate",
"betterend:virid_jadestone_polished",
"betterend:virid_jadestone_slab",
"betterend:virid_jadestone_stairs",
"betterend:virid_jadestone_tiles",
"betterend:virid_jadestone_wall",

2
src/main/java/ru/betterend/mixin/common/ShuffelingListMixin.java
View file

@ -4,7 +4,7 @@ import net.minecraft.world.entity.ai.behavior.ShufflingList;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import ru.betterend.util.ShuffelingListExtended;
import ru.betterend.interfaces.ShuffelingListExtended;
import java.util.List;

3
src/main/java/ru/betterend/registry/EndBiomes.java
View file

@ -242,6 +242,7 @@ public class EndBiomes {
*/
public static EndBiome registerBiome(Biome biome, BiomeType type, float fogDensity, float genChance) {
EndBiome endBiome = new EndBiome(BuiltinRegistries.BIOME.getKey(biome), biome, fogDensity, genChance, true);
BiomeAPI.registerBiome(endBiome);
if (Configs.BIOME_CONFIG.getBoolean(endBiome.getID(), "enabled", true)) {
addToPicker(endBiome, type);
}
@ -271,12 +272,12 @@ public class EndBiomes {
*/
public static EndBiome registerSubBiome(Biome biome, EndBiome parent, float fogDensity, float genChance, boolean hasCaves) {
EndBiome endBiome = new EndBiome(BuiltinRegistries.BIOME.getKey(biome), biome, fogDensity, genChance, hasCaves);
BiomeAPI.registerBiome(endBiome);
if (Configs.BIOME_CONFIG.getBoolean(endBiome.getID(), "enabled", true)) {
BiomeAPI.registerBiome(endBiome);
parent.addSubBiome(endBiome);
SUBBIOMES.add(endBiome);
SUBBIOMES_UNMUTABLES.add(endBiome.getID());
BiomeAPI.registerBiome(endBiome);
}
return endBiome;
}

9
src/main/java/ru/betterend/registry/EndTags.java
View file

@ -15,6 +15,7 @@ import net.minecraft.world.item.Items;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.biome.Biome.BiomeCategory;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.LeavesBlock;
import net.minecraft.world.level.block.state.BlockBehaviour.Properties;
import net.minecraft.world.level.levelgen.surfacebuilders.SurfaceBuilderConfiguration;
@ -53,7 +54,7 @@ public class EndTags {
Properties properties = ((AbstractBlockAccessor) block).getSettings();
Material material = ((AbstractBlockSettingsAccessor) properties).getMaterial();
if (material.equals(Material.STONE)) {
if (material.equals(Material.STONE) || material.equals(Material.METAL)) {
TagHelper.addTag(TagAPI.MINEABLE_PICKAXE, block);
}
else if (material.equals(Material.WOOD)) {
@ -69,7 +70,7 @@ public class EndTags {
if (block instanceof EndTerrainBlock) {
TagAPI.addEndGround(block);
TagHelper.addTag(BlockTags.NYLIUM, block);
BonemealAPI.addSpreadableBlock(block);
BonemealAPI.addSpreadableBlock(block, Blocks.END_STONE);
}
else if (block instanceof LeavesBlock || block instanceof SimpleLeavesBlock) {
TagHelper.addTag(BlockTags.LEAVES, block);
@ -89,7 +90,9 @@ public class EndTags {
});
TagAPI.addEndGround(EndBlocks.CAVE_MOSS);
TagHelper.addTag(BlockTags.NYLIUM, EndBlocks.CAVE_MOSS);
BonemealAPI.addSpreadableBlock(EndBlocks.CAVE_MOSS);
BonemealAPI.addSpreadableBlock(EndBlocks.CAVE_MOSS, Blocks.END_STONE);
BonemealAPI.addSpreadableBlock(EndBlocks.MOSSY_OBSIDIAN, Blocks.OBSIDIAN);
BonemealAPI.addSpreadableBlock(EndBlocks.MOSSY_DRAGON_BONE, EndBlocks.DRAGON_BONE_BLOCK);
List<Item> hammers = Lists.newArrayList();
EndItems.getModItems(BetterEnd.MOD_ID).forEach(item -> {

62
src/main/java/ru/betterend/util/BonemealPlants.java
View file

@ -1,9 +1,16 @@
package ru.betterend.util;
import com.google.common.collect.Lists;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.Blocks;
import ru.bclib.api.BonemealAPI;
import ru.bclib.api.TagAPI;
import ru.betterend.blocks.basis.EndTerrainBlock;
import ru.betterend.registry.EndBiomes;
import ru.betterend.registry.EndBlocks;
import java.util.List;
public class BonemealPlants {
public static void init() {
BonemealAPI.addLandGrass(EndBlocks.CREEPING_MOSS, EndBlocks.END_MOSS);
@ -20,38 +27,67 @@ public class BonemealPlants {
BonemealAPI.addLandGrass(EndBlocks.JUNGLE_GRASS, EndBlocks.JUNGLE_MOSS);
BonemealAPI.addLandGrass(EndBlocks.TWISTED_UMBRELLA_MOSS, EndBlocks.JUNGLE_MOSS);
BonemealAPI.addLandGrass(EndBlocks.JUNGLE_MOSS, EndBlocks.SMALL_JELLYSHROOM, 0.1F);
BonemealAPI.addLandGrass(EndBlocks.SMALL_JELLYSHROOM, EndBlocks.JUNGLE_MOSS, 0.1F);
BonemealAPI.addLandGrass(EndBiomes.GLOWING_GRASSLANDS.getID(), EndBlocks.BLOOMING_COOKSONIA, EndBlocks.END_MOSS);
BonemealAPI.addLandGrass(EndBiomes.GLOWING_GRASSLANDS.getID(), EndBlocks.VAIOLUSH_FERN, EndBlocks.END_MOSS);
BonemealAPI.addLandGrass(EndBiomes.GLOWING_GRASSLANDS.getID(), EndBlocks.FRACTURN, EndBlocks.END_MOSS);
BonemealAPI.addLandGrass(EndBiomes.GLOWING_GRASSLANDS.getID(), EndBlocks.SALTEAGO, EndBlocks.END_MOSS);
BonemealAPI.addLandGrass(EndBiomes.GLOWING_GRASSLANDS.getID(), EndBlocks.END_MOSS, EndBlocks.CREEPING_MOSS, 0.1F);
BonemealAPI.addLandGrass(EndBiomes.GLOWING_GRASSLANDS.getID(), EndBlocks.END_MOSS, EndBlocks.UMBRELLA_MOSS, 0.1F);
BonemealAPI.addLandGrass(EndBiomes.GLOWING_GRASSLANDS.getID(), EndBlocks.END_MOSS, EndBlocks.TWISTED_UMBRELLA_MOSS, 0.1F);
BonemealAPI.addLandGrass(EndBiomes.GLOWING_GRASSLANDS.getID(), EndBlocks.CREEPING_MOSS, EndBlocks.END_MOSS, 0.1F);
BonemealAPI.addLandGrass(EndBiomes.GLOWING_GRASSLANDS.getID(), EndBlocks.UMBRELLA_MOSS, EndBlocks.END_MOSS, 0.1F);
BonemealAPI.addLandGrass(EndBiomes.GLOWING_GRASSLANDS.getID(), EndBlocks.TWISTED_UMBRELLA_MOSS, EndBlocks.END_MOSS, 0.1F);
BonemealAPI.addLandGrass(EndBlocks.ORANGO, EndBlocks.RUTISCUS);
BonemealAPI.addLandGrass(EndBlocks.RUTISCUS, EndBlocks.AERIDIUM, 0.2F);
BonemealAPI.addLandGrass(EndBlocks.RUTISCUS, EndBlocks.LUTEBUS, 0.2F);
BonemealAPI.addLandGrass(EndBlocks.RUTISCUS, EndBlocks.LAMELLARIUM);
BonemealAPI.addLandGrass(EndBlocks.AERIDIUM, EndBlocks.RUTISCUS, 0.2F);
BonemealAPI.addLandGrass(EndBlocks.LUTEBUS, EndBlocks.RUTISCUS, 0.2F);
BonemealAPI.addLandGrass(EndBlocks.LAMELLARIUM, EndBlocks.RUTISCUS);
BonemealAPI.addLandGrass(EndBiomes.LANTERN_WOODS.getID(), EndBlocks.RUTISCUS, EndBlocks.AERIDIUM, 0.2F);
BonemealAPI.addLandGrass(EndBiomes.LANTERN_WOODS.getID(), EndBlocks.AERIDIUM, EndBlocks.RUTISCUS, 0.2F);
BonemealAPI.addLandGrass(EndBiomes.LANTERN_WOODS.getID(), EndBlocks.LAMELLARIUM, EndBlocks.RUTISCUS);
BonemealAPI.addLandGrass(EndBiomes.LANTERN_WOODS.getID(), EndBlocks.RUTISCUS, EndBlocks.BOLUX_MUSHROOM, 0.05F);
BonemealAPI.addLandGrass(EndBiomes.LANTERN_WOODS.getID(), EndBlocks.BOLUX_MUSHROOM, EndBlocks.RUTISCUS, 0.05F);
BonemealAPI.addLandGrass(EndBlocks.GLOBULAGUS, EndBlocks.SANGNUM, EndBlocks.MOSSY_OBSIDIAN, EndBlocks.MOSSY_DRAGON_BONE);
BonemealAPI.addLandGrass(EndBlocks.CLAWFERN, EndBlocks.SANGNUM, EndBlocks.MOSSY_OBSIDIAN, EndBlocks.MOSSY_DRAGON_BONE);
BonemealAPI.addLandGrass(EndBlocks.SANGNUM, EndBlocks.SMALL_AMARANITA_MUSHROOM, 0.1F);
BonemealAPI.addLandGrass(EndBlocks.MOSSY_OBSIDIAN, EndBlocks.SMALL_AMARANITA_MUSHROOM, 0.1F);
BonemealAPI.addLandGrass(EndBlocks.MOSSY_DRAGON_BONE, EndBlocks.SMALL_AMARANITA_MUSHROOM, 0.1F);
BonemealAPI.addLandGrass(EndBlocks.SMALL_AMARANITA_MUSHROOM, EndBlocks.MOSSY_OBSIDIAN, 0.1F);
BonemealAPI.addLandGrass(EndBlocks.SMALL_AMARANITA_MUSHROOM, EndBlocks.MOSSY_DRAGON_BONE, 0.1F);
BonemealAPI.addLandGrass(EndBlocks.GLOBULAGUS, EndBlocks.MOSSY_DRAGON_BONE);
BonemealAPI.addLandGrass(EndBlocks.CLAWFERN, EndBlocks.MOSSY_DRAGON_BONE);
BonemealAPI.addLandGrass(EndBlocks.MOSSY_DRAGON_BONE, EndBlocks.SMALL_AMARANITA_MUSHROOM, 0.1F);
BonemealAPI.addLandGrass(EndBlocks.SMALL_AMARANITA_MUSHROOM, EndBlocks.MOSSY_DRAGON_BONE, 0.1F);
BonemealAPI.addLandGrass(EndBlocks.GLOBULAGUS, EndBlocks.MOSSY_OBSIDIAN);
BonemealAPI.addLandGrass(EndBlocks.CLAWFERN, EndBlocks.MOSSY_OBSIDIAN);
BonemealAPI.addLandGrass(EndBlocks.MOSSY_OBSIDIAN, EndBlocks.SMALL_AMARANITA_MUSHROOM, 0.1F);
BonemealAPI.addLandGrass(EndBlocks.SMALL_AMARANITA_MUSHROOM, EndBlocks.MOSSY_OBSIDIAN, 0.1F);
Block[] charnias = new Block[] {
EndBlocks.CHARNIA_CYAN,
EndBlocks.CHARNIA_GREEN,
EndBlocks.CHARNIA_ORANGE,
EndBlocks.CHARNIA_LIGHT_BLUE,
EndBlocks.CHARNIA_PURPLE,
EndBlocks.CHARNIA_RED
};
List<Block> terrain = Lists.newArrayList();
EndBlocks.getModBlocks().forEach(block -> {
if (block instanceof EndTerrainBlock) {
terrain.add(block);
}
});
terrain.add(Blocks.END_STONE);
terrain.add(EndBlocks.ENDSTONE_DUST);
terrain.add(EndBlocks.CAVE_MOSS);
terrain.add(EndBlocks.SULPHURIC_ROCK.stone);
terrain.add(EndBlocks.VIOLECITE.stone);
terrain.add(EndBlocks.FLAVOLITE.stone);
terrain.add(EndBlocks.AZURE_JADESTONE.stone);
terrain.add(EndBlocks.VIRID_JADESTONE.stone);
terrain.add(EndBlocks.SANDY_JADESTONE.stone);
terrain.add(EndBlocks.BRIMSTONE);
Block[] terrainBlocks = terrain.toArray(new Block[terrain.size()]);
for (Block charnia: charnias) {
BonemealAPI.addWaterGrass(charnia, terrainBlocks);
}
}
}

2
src/main/java/ru/betterend/world/biome/cave/EndCaveBiome.java
View file

@ -10,7 +10,7 @@ import ru.bclib.world.biomes.BCLBiomeDef;
import ru.bclib.world.features.BCLFeature;
import ru.betterend.BetterEnd;
import ru.betterend.registry.EndSounds;
import ru.betterend.util.ShuffelingListExtended;
import ru.betterend.interfaces.ShuffelingListExtended;
import ru.betterend.world.biome.EndBiome;
import ru.betterend.world.features.terrain.caves.CaveChunkPopulatorFeature;

2
src/main/resources/fabric.mod.json
View file

@ -45,7 +45,7 @@
"fabricloader": ">=0.11.6",
"fabric": ">=0.36.0",
"minecraft": ">=1.17",
"bclib": ">=0.2.2"
"bclib": ">=0.2.3"
},
"suggests": {
"byg": ">=1.1.3",