From 5e9ecc8c3cb61dcf1efe287b42a305660072b4b1 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Tue, 4 May 2021 13:35:11 +0300 Subject: [PATCH 1/2] Cleanup --- .../java/ru/betterend/registry/EndItems.java | 34 +++++++++++++++---- .../world/generator/BetterEndBiomeSource.java | 3 ++ 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index 60288137..923eb62d 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -1,6 +1,9 @@ package ru.betterend.registry; +import java.util.List; + import com.google.common.collect.Lists; + import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags; import net.minecraft.core.BlockSource; @@ -17,20 +20,39 @@ import net.minecraft.world.entity.EquipmentSlot; import net.minecraft.world.entity.MobSpawnType; import net.minecraft.world.food.FoodProperties; import net.minecraft.world.food.Foods; -import net.minecraft.world.item.*; +import net.minecraft.world.item.ArmorItem; +import net.minecraft.world.item.Item; +import net.minecraft.world.item.ItemStack; +import net.minecraft.world.item.Items; +import net.minecraft.world.item.Rarity; +import net.minecraft.world.item.ShovelItem; +import net.minecraft.world.item.SpawnEggItem; +import net.minecraft.world.item.SwordItem; +import net.minecraft.world.item.TieredItem; +import net.minecraft.world.item.Tiers; import net.minecraft.world.level.block.DispenserBlock; import ru.betterend.BetterEnd; import ru.betterend.config.Configs; -import ru.betterend.interfaces.MultiModelItem; -import ru.betterend.item.*; +import ru.betterend.item.ArmoredElytra; +import ru.betterend.item.DrinkItem; +import ru.betterend.item.EnchantedPetalItem; +import ru.betterend.item.EndArmorItem; +import ru.betterend.item.EndBucketItem; +import ru.betterend.item.EndSpawnEggItem; +import ru.betterend.item.EternalCrystalItem; +import ru.betterend.item.PatternedDiscItem; +import ru.betterend.item.PatternedItem; import ru.betterend.item.material.EndArmorMaterial; import ru.betterend.item.material.EndToolMaterial; -import ru.betterend.item.tool.*; +import ru.betterend.item.tool.EndAxeItem; +import ru.betterend.item.tool.EndHammerItem; +import ru.betterend.item.tool.EndHoeItem; +import ru.betterend.item.tool.EndPickaxeItem; +import ru.betterend.item.tool.EndShovelItem; +import ru.betterend.item.tool.EndSwordItem; import ru.betterend.tab.CreativeTabs; import ru.betterend.util.TagHelper; -import java.util.List; - public class EndItems { private static final List MOD_BLOCKS = Lists.newArrayList(); private static final List MOD_ITEMS = Lists.newArrayList(); diff --git a/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java b/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java index ff86b727..167035c1 100644 --- a/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java +++ b/src/main/java/ru/betterend/world/generator/BetterEndBiomeSource.java @@ -95,6 +95,9 @@ public class BetterEndBiomeSource extends BiomeSource { endBiome = mapLand.getBiome(biomeX << 2, biomeZ << 2); } else { + if (!GeneratorOptions.noRingVoid() && dist <= 65536L) { + return barrens; + } endBiome = mapVoid.getBiome(biomeX << 2, biomeZ << 2); } } From 5ded09d0037b183efbdf6ebcb51aa9670825a0b2 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Tue, 4 May 2021 13:35:33 +0300 Subject: [PATCH 2/2] Version change --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 9abb7905..379a7bf0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ loader_version=0.11.3 # Mod Properties - mod_version = 0.9.4-pre + mod_version = 0.9.5-pre maven_group = ru.betterend archives_base_name = better-end