From 0c93573d818935e59f458cd2ab0eb08e6f170dd3 Mon Sep 17 00:00:00 2001 From: Justin Parsell Date: Fri, 26 Feb 2021 01:43:07 -0500 Subject: [PATCH] Added leaves coloration and cleaned up imports --- src/main/java/net/parsell/cherry/Cherry.java | 4 +++- .../java/net/parsell/cherry/core/CherryBlocks.java | 14 +++++++++----- .../net/parsell/cherry/core/CherryFeatures.java | 6 ------ .../java/net/parsell/cherry/core/CherryItems.java | 9 ++++++++- .../assets/cherry/models/block/cherry_leaves.json | 2 +- 5 files changed, 21 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/parsell/cherry/Cherry.java b/src/main/java/net/parsell/cherry/Cherry.java index 957621a..855a81f 100644 --- a/src/main/java/net/parsell/cherry/Cherry.java +++ b/src/main/java/net/parsell/cherry/Cherry.java @@ -1,6 +1,9 @@ package net.parsell.cherry; import net.fabricmc.api.ModInitializer; +import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; import net.parsell.cherry.core.*; public class Cherry implements ModInitializer { @@ -14,6 +17,5 @@ public class Cherry implements ModInitializer { CherryBlocks.init(); CherryItems.init(); CherryFeatures.init(); - } } diff --git a/src/main/java/net/parsell/cherry/core/CherryBlocks.java b/src/main/java/net/parsell/cherry/core/CherryBlocks.java index 0deb872..9e5c2c0 100644 --- a/src/main/java/net/parsell/cherry/core/CherryBlocks.java +++ b/src/main/java/net/parsell/cherry/core/CherryBlocks.java @@ -1,5 +1,6 @@ package net.parsell.cherry.core; +import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; import net.minecraft.block.Block; @@ -11,16 +12,19 @@ import net.minecraft.util.registry.Registry; public class CherryBlocks { public static final Block CHERRYLOG = new PillarBlock(FabricBlockSettings.copyOf(Blocks.OAK_LOG)); - public static final Block CHERRYLEAVES = new LeavesBlock(FabricBlockSettings.copyOf(Blocks.OAK_LEAVES)); + public static final Block CHERRYLEAVES = new LeavesBlock(FabricBlockSettings.copyOf(Blocks.OAK_LEAVES)); - private static void registerBlocks(){ + private static void registerBlocks() { System.out.println("Adding blocks..."); - Registry.register(Registry.BLOCK, new Identifier("cherry", "cherry_log"), CHERRYLOG); - Registry.register(Registry.BLOCK, new Identifier("cherry", "cherry_leaves"), CHERRYLEAVES); - System.out.println("Successfully added blocks!"); + Registry.register(Registry.BLOCK, new Identifier("cherry", "cherry_log"), CHERRYLOG); + Registry.register(Registry.BLOCK, new Identifier("cherry", "cherry_leaves"), CHERRYLEAVES); + System.out.println("Successfully added blocks!"); System.out.println("Setting flammability..."); FlammableBlockRegistry.getDefaultInstance().add(CHERRYLOG, 5, 5); FlammableBlockRegistry.getDefaultInstance().add(CHERRYLEAVES, 30, 60); + ColorProviderRegistry.BLOCK.register((state, world, pos, tintIndex) -> { + return 6649929; + }, CHERRYLEAVES); } public static void init(){ diff --git a/src/main/java/net/parsell/cherry/core/CherryFeatures.java b/src/main/java/net/parsell/cherry/core/CherryFeatures.java index 75d0f65..950ae97 100644 --- a/src/main/java/net/parsell/cherry/core/CherryFeatures.java +++ b/src/main/java/net/parsell/cherry/core/CherryFeatures.java @@ -12,22 +12,16 @@ import net.minecraft.util.registry.RegistryKey; import net.minecraft.world.biome.BiomeKeys; import net.minecraft.world.gen.GenerationStep; import net.minecraft.world.gen.UniformIntDistribution; -import net.minecraft.world.gen.decorator.ChanceDecoratorConfig; import net.minecraft.world.gen.decorator.CountExtraDecoratorConfig; import net.minecraft.world.gen.decorator.Decorator; import net.minecraft.world.gen.feature.ConfiguredFeature; import net.minecraft.world.gen.feature.ConfiguredFeatures; import net.minecraft.world.gen.feature.DefaultFeatureConfig; import net.minecraft.world.gen.feature.Feature; -import net.minecraft.world.gen.feature.FeatureConfig; import net.minecraft.world.gen.feature.RandomFeatureConfig; -import net.minecraft.world.gen.feature.TreeFeature; import net.minecraft.world.gen.feature.TreeFeatureConfig; -import net.minecraft.world.gen.feature.TreeFeatureConfig.Builder; -import net.minecraft.world.gen.feature.size.FeatureSize; import net.minecraft.world.gen.feature.size.TwoLayersFeatureSize; import net.minecraft.world.gen.foliage.BlobFoliagePlacer; -import net.minecraft.world.gen.foliage.FoliagePlacer; import net.minecraft.world.gen.stateprovider.SimpleBlockStateProvider; import net.minecraft.world.gen.trunk.StraightTrunkPlacer; import net.parsell.cherry.common.features.CherryTree; diff --git a/src/main/java/net/parsell/cherry/core/CherryItems.java b/src/main/java/net/parsell/cherry/core/CherryItems.java index 482530c..fc6ee03 100644 --- a/src/main/java/net/parsell/cherry/core/CherryItems.java +++ b/src/main/java/net/parsell/cherry/core/CherryItems.java @@ -1,5 +1,6 @@ package net.parsell.cherry.core; +import net.fabricmc.fabric.api.client.rendering.v1.ColorProviderRegistry; import net.fabricmc.fabric.api.item.v1.FabricItemSettings; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; @@ -7,11 +8,17 @@ import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; public class CherryItems { + public static BlockItem CHERRYLEAVES_I = new BlockItem(CherryBlocks.CHERRYLEAVES, new FabricItemSettings().group(ItemGroup.BUILDING_BLOCKS)); + private static void registerBlockItems(){ System.out.println("Adding items..."); Registry.register(Registry.ITEM, new Identifier("cherry", "cherry_log"), new BlockItem(CherryBlocks.CHERRYLOG, new FabricItemSettings().group(ItemGroup.BUILDING_BLOCKS))); - Registry.register(Registry.ITEM, new Identifier("cherry", "cherry_leaves"), new BlockItem(CherryBlocks.CHERRYLEAVES, new FabricItemSettings().group(ItemGroup.BUILDING_BLOCKS))); + Registry.register(Registry.ITEM, new Identifier("cherry", "cherry_leaves"), CHERRYLEAVES_I); System.out.println("Successfully added items!"); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> { + return 6649929; + }, CherryBlocks.CHERRYLEAVES + ); } public static void init(){ diff --git a/src/main/resources/assets/cherry/models/block/cherry_leaves.json b/src/main/resources/assets/cherry/models/block/cherry_leaves.json index d341266..ee78517 100644 --- a/src/main/resources/assets/cherry/models/block/cherry_leaves.json +++ b/src/main/resources/assets/cherry/models/block/cherry_leaves.json @@ -1,5 +1,5 @@ { - "parent": "block/cube_all", + "parent": "block/leaves", "textures": { "all": "cherry:block/cherry_leaves" }