From c1e1065c3b0e7797d13de2c621f6af44afec8073 Mon Sep 17 00:00:00 2001 From: Steven Tracey Date: Mon, 8 Nov 2021 19:16:21 -0500 Subject: [PATCH] Fixed OreGen and Enchanted Apples not Glowing --- gradle.properties | 4 +-- src/main/java/tech/nevets/vplus/Main.java | 2 ++ .../vplus/food/EnchantedDiamondApple.java | 5 +++ .../vplus/food/EnchantedEmeraldApple.java | 5 +++ .../nevets/vplus/food/EnchantedIronApple.java | 5 +++ .../vplus/food/EnchantedNetheriteApple.java | 5 +++ .../vplus/food/EnchantedPlatinumApple.java | 5 +++ .../nevets/vplus/food/EnchantedRubyApple.java | 5 +++ .../java/tech/nevets/vplus/misc/VPOreGen.java | 35 +++++++++++++------ 9 files changed, 59 insertions(+), 12 deletions(-) diff --git a/gradle.properties b/gradle.properties index 899d87f..82dc4e2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ # Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx2G +#org.gradle.jvmargs=-Xmx2G # Fabric Properties # check these on https://fabricmc.net/versions.html @@ -8,7 +8,7 @@ yarn_mappings=1.17.1+build.63 loader_version=0.11.7 # Mod Properties -mod_version = 1.0.0 +mod_version = 0.2.0 maven_group = tech.nevets archives_base_name = vplus diff --git a/src/main/java/tech/nevets/vplus/Main.java b/src/main/java/tech/nevets/vplus/Main.java index 42c5e6c..69268fc 100644 --- a/src/main/java/tech/nevets/vplus/Main.java +++ b/src/main/java/tech/nevets/vplus/Main.java @@ -6,6 +6,7 @@ import tech.nevets.vplus.blocks.VPBlocks; import tech.nevets.vplus.food.VPFood; import tech.nevets.vplus.items.VPItems; import tech.nevets.vplus.misc.VPFuels; +import tech.nevets.vplus.misc.VPOreGen; import tech.nevets.vplus.misc.VPZoom; import tech.nevets.vplus.tools.VPTools; @@ -18,6 +19,7 @@ public class Main implements ModInitializer { VPFood.vpFood(); VPTools.vpTools(); VPArmor.vpArmor(); + VPOreGen.vpOres(); VPFuels.vpFuels(); VPZoom.vpZoom(); } diff --git a/src/main/java/tech/nevets/vplus/food/EnchantedDiamondApple.java b/src/main/java/tech/nevets/vplus/food/EnchantedDiamondApple.java index 79582da..8f83579 100644 --- a/src/main/java/tech/nevets/vplus/food/EnchantedDiamondApple.java +++ b/src/main/java/tech/nevets/vplus/food/EnchantedDiamondApple.java @@ -4,10 +4,15 @@ import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tech.nevets.vplus.items.VPItemGroups; public class EnchantedDiamondApple extends Item { public EnchantedDiamondApple() { super(new Settings().group(VPItemGroups.FOOD).food(new FoodComponent.Builder().hunger(8).saturationModifier(14).alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 4),1f).build())); } + + public boolean hasGlint(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/tech/nevets/vplus/food/EnchantedEmeraldApple.java b/src/main/java/tech/nevets/vplus/food/EnchantedEmeraldApple.java index 5ed0c25..33991ec 100644 --- a/src/main/java/tech/nevets/vplus/food/EnchantedEmeraldApple.java +++ b/src/main/java/tech/nevets/vplus/food/EnchantedEmeraldApple.java @@ -4,10 +4,15 @@ import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tech.nevets.vplus.items.VPItemGroups; public class EnchantedEmeraldApple extends Item { public EnchantedEmeraldApple() { super(new Settings().group(VPItemGroups.FOOD).food(new FoodComponent.Builder().hunger(12).saturationModifier(16).alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 6),1f).build())); } + + public boolean hasGlint(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/tech/nevets/vplus/food/EnchantedIronApple.java b/src/main/java/tech/nevets/vplus/food/EnchantedIronApple.java index e826f6e..02357a7 100644 --- a/src/main/java/tech/nevets/vplus/food/EnchantedIronApple.java +++ b/src/main/java/tech/nevets/vplus/food/EnchantedIronApple.java @@ -4,10 +4,15 @@ import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tech.nevets.vplus.items.VPItemGroups; public class EnchantedIronApple extends Item { public EnchantedIronApple() { super(new Settings().group(VPItemGroups.FOOD).food(new FoodComponent.Builder().hunger(6).saturationModifier(10).alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 2),1f).build())); } + + public boolean hasGlint(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/tech/nevets/vplus/food/EnchantedNetheriteApple.java b/src/main/java/tech/nevets/vplus/food/EnchantedNetheriteApple.java index a7d8aa4..ab8b09f 100644 --- a/src/main/java/tech/nevets/vplus/food/EnchantedNetheriteApple.java +++ b/src/main/java/tech/nevets/vplus/food/EnchantedNetheriteApple.java @@ -4,10 +4,15 @@ import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tech.nevets.vplus.items.VPItemGroups; public class EnchantedNetheriteApple extends Item { public EnchantedNetheriteApple() { super(new Settings().group(VPItemGroups.FOOD).food(new FoodComponent.Builder().hunger(14).saturationModifier(18).alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 8),1f).build())); } + + public boolean hasGlint(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/tech/nevets/vplus/food/EnchantedPlatinumApple.java b/src/main/java/tech/nevets/vplus/food/EnchantedPlatinumApple.java index b8ca1e1..240205f 100644 --- a/src/main/java/tech/nevets/vplus/food/EnchantedPlatinumApple.java +++ b/src/main/java/tech/nevets/vplus/food/EnchantedPlatinumApple.java @@ -4,10 +4,15 @@ import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tech.nevets.vplus.items.VPItemGroups; public class EnchantedPlatinumApple extends Item { public EnchantedPlatinumApple() { super(new Settings().group(VPItemGroups.FOOD).food(new FoodComponent.Builder().hunger(16).saturationModifier(20).alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 10),1f).build())); } + + public boolean hasGlint(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/tech/nevets/vplus/food/EnchantedRubyApple.java b/src/main/java/tech/nevets/vplus/food/EnchantedRubyApple.java index 2772ad6..9d7e260 100644 --- a/src/main/java/tech/nevets/vplus/food/EnchantedRubyApple.java +++ b/src/main/java/tech/nevets/vplus/food/EnchantedRubyApple.java @@ -4,10 +4,15 @@ import net.minecraft.entity.effect.StatusEffectInstance; import net.minecraft.entity.effect.StatusEffects; import net.minecraft.item.FoodComponent; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import tech.nevets.vplus.items.VPItemGroups; public class EnchantedRubyApple extends Item { public EnchantedRubyApple() { super(new Settings().group(VPItemGroups.FOOD).food(new FoodComponent.Builder().hunger(18).saturationModifier(22).alwaysEdible().statusEffect(new StatusEffectInstance(StatusEffects.REGENERATION, 20*120, 12),1f).build())); } + + public boolean hasGlint(ItemStack stack) { + return true; + } } \ No newline at end of file diff --git a/src/main/java/tech/nevets/vplus/misc/VPOreGen.java b/src/main/java/tech/nevets/vplus/misc/VPOreGen.java index 2032dbd..d9f5bde 100644 --- a/src/main/java/tech/nevets/vplus/misc/VPOreGen.java +++ b/src/main/java/tech/nevets/vplus/misc/VPOreGen.java @@ -1,23 +1,30 @@ package tech.nevets.vplus.misc; +import net.fabricmc.fabric.api.biome.v1.BiomeModifications; +import net.fabricmc.fabric.api.biome.v1.BiomeSelectors; +import net.minecraft.util.Identifier; +import net.minecraft.util.registry.BuiltinRegistries; +import net.minecraft.util.registry.Registry; +import net.minecraft.util.registry.RegistryKey; +import net.minecraft.world.gen.GenerationStep; +import net.minecraft.world.gen.YOffset; import net.minecraft.world.gen.decorator.Decorator; +import net.minecraft.world.gen.decorator.RangeDecoratorConfig; import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.Feature; import net.minecraft.world.gen.feature.OreFeatureConfig; +import net.minecraft.world.gen.heightprovider.UniformHeightProvider; import tech.nevets.vplus.blocks.VPBlocks; public class VPOreGen { - /* private static ConfiguredFeature ORE_PLATINUM_OVERWORLD = Feature.ORE .configure(new OreFeatureConfig( OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, VPBlocks.PLATINUMORE.getDefaultState(), 3)) // vein size - .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig( - 0, // bottom offset - 0, // min y level - 15))) // max y level + .range(new RangeDecoratorConfig( + UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.fixed(15)))) .spreadHorizontally() .repeat(2); // number of veins per chunk @@ -26,12 +33,20 @@ public class VPOreGen { OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, VPBlocks.RUBYORE.getDefaultState(), 1)) // vein size - .decorate(Decorator.RANGE.configure(new RangeDecoratorConfig( - 0, // bottom offset - 0, // min y level - 256))) // max y level + .range(new RangeDecoratorConfig( + UniformHeightProvider.create(YOffset.aboveBottom(0), YOffset.fixed(256)))) .spreadHorizontally() .repeat(8); // number of veins per chunk - */ + public static void vpOres() { + RegistryKey> platinumOreOverworld = RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, + new Identifier("vplus", "platinum_ore")); + Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, platinumOreOverworld.getValue(), ORE_PLATINUM_OVERWORLD); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, platinumOreOverworld); + + RegistryKey> rubyOreOverworld = RegistryKey.of(Registry.CONFIGURED_FEATURE_KEY, + new Identifier("vplus", "ruby_ore")); + Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, rubyOreOverworld.getValue(), ORE_RUBY_OVERWORLD); + BiomeModifications.addFeature(BiomeSelectors.foundInOverworld(), GenerationStep.Feature.UNDERGROUND_ORES, rubyOreOverworld); + } }