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

Merge branch 'main' of github.com-quiqueck:paulevsGitch/BCLib

Browse source
This commit is contained in:
Frank 2021-12-04 13:36:52 +01:00
commit 1841bad98f
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
gradle.properties
View file

@ -11,7 +11,7 @@ loader_version= 0.12.8
fabric_version = 0.44.0+1.18 fabric_version = 0.44.0+1.18
# Mod Properties # Mod Properties
mod_version = 1.0.0 mod_version = 1.0.1
maven_group = ru.bclib maven_group = ru.bclib
archives_base_name = bclib archives_base_name = bclib

4
src/main/java/ru/bclib/blocks/BaseOreBlock.java
View file

@ -5,7 +5,6 @@ import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
import net.fabricmc.fabric.impl.object.builder.FabricBlockInternals; import net.fabricmc.fabric.impl.object.builder.FabricBlockInternals;
import net.minecraft.client.renderer.block.model.BlockModel; import net.minecraft.client.renderer.block.model.BlockModel;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.tags.Tag.Named;
import net.minecraft.util.Mth; import net.minecraft.util.Mth;
import net.minecraft.util.valueproviders.UniformInt; import net.minecraft.util.valueproviders.UniformInt;
import net.minecraft.world.item.Item; import net.minecraft.world.item.Item;
@ -13,7 +12,6 @@ import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.enchantment.EnchantmentHelper; import net.minecraft.world.item.enchantment.EnchantmentHelper;
import net.minecraft.world.item.enchantment.Enchantments; import net.minecraft.world.item.enchantment.Enchantments;
import net.minecraft.world.level.ItemLike; import net.minecraft.world.level.ItemLike;
import net.minecraft.world.level.block.Block;
import net.minecraft.world.level.block.OreBlock; import net.minecraft.world.level.block.OreBlock;
import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.SoundType;
import net.minecraft.world.level.block.state.BlockState; import net.minecraft.world.level.block.state.BlockState;
@ -21,9 +19,7 @@ import net.minecraft.world.level.material.Material;
import net.minecraft.world.level.material.MaterialColor; import net.minecraft.world.level.material.MaterialColor;
import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.LootContext;
import net.minecraft.world.level.storage.loot.parameters.LootContextParams; import net.minecraft.world.level.storage.loot.parameters.LootContextParams;
import ru.bclib.api.TagAPI;
import ru.bclib.interfaces.BlockModelProvider; import ru.bclib.interfaces.BlockModelProvider;
import ru.bclib.interfaces.TagProvider;
import ru.bclib.util.MHelper; import ru.bclib.util.MHelper;
import java.util.Collections; import java.util.Collections;

16
src/main/java/ru/bclib/world/biomes/BCLBiome.java
View file

@ -8,6 +8,7 @@ import net.minecraft.resources.ResourceKey;
import net.minecraft.resources.ResourceLocation; import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.biome.Biome; import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.levelgen.SurfaceRules; import net.minecraft.world.level.levelgen.SurfaceRules;
import net.minecraft.world.level.levelgen.SurfaceRules.RuleSource;
import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature; import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import ru.bclib.api.biomes.BiomeAPI; import ru.bclib.api.biomes.BiomeAPI;
@ -16,6 +17,7 @@ import ru.bclib.util.WeightedList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import java.util.function.Consumer;
public class BCLBiome { public class BCLBiome {
private final List<ConfiguredStructureFeature> structures = Lists.newArrayList(); private final List<ConfiguredStructureFeature> structures = Lists.newArrayList();
@ -24,7 +26,7 @@ public class BCLBiome {
private final ResourceLocation biomeID; private final ResourceLocation biomeID;
private final Biome biome; private final Biome biome;
private SurfaceRules.RuleSource surface; private Consumer<Biome> surfaceInit;
private BCLBiome biomeParent; private BCLBiome biomeParent;
private Biome actualBiome; private Biome actualBiome;
private BCLBiome edge; private BCLBiome edge;
@ -229,9 +231,8 @@ public class BCLBiome {
structures.forEach(s -> BiomeAPI.addBiomeStructure(BiomeAPI.getBiomeKey(actualBiome), s)); structures.forEach(s -> BiomeAPI.addBiomeStructure(BiomeAPI.getBiomeKey(actualBiome), s));
} }
if (this.surface!=null){ if (this.surfaceInit != null) {
ResourceKey key = BiomeAPI.getBiomeKey(actualBiome); surfaceInit.accept(actualBiome);
BiomeAPI.addSurfaceRule(biomeID, SurfaceRules.ifTrue(SurfaceRules.isBiome(key), surface));
} }
} }
@ -317,7 +318,10 @@ public class BCLBiome {
* Sets biome surface rule. * Sets biome surface rule.
* @param surface {@link SurfaceRules.RuleSource} rule. * @param surface {@link SurfaceRules.RuleSource} rule.
*/ */
public void setSurface(SurfaceRules.RuleSource surface) { public void setSurface(RuleSource surface) {
this.surface = surface; this.surfaceInit = (actualBiome) -> {
ResourceKey key = BiomeAPI.getBiomeKey(actualBiome);
BiomeAPI.addSurfaceRule(biomeID, SurfaceRules.ifTrue(SurfaceRules.isBiome(key), surface));
};
} }
} }