From 4169f908fca95651047ec4bdabbc0bdcf304c3c0 Mon Sep 17 00:00:00 2001 From: Justin Parsell Date: Fri, 26 Feb 2021 20:01:20 -0500 Subject: [PATCH] introduction of cherry planks & register update --- src/main/java/net/parsell/cherry/Cherry.java | 8 ++-- .../net/parsell/cherry/core/CherryBlocks.java | 45 +++++++++++------- .../parsell/cherry/core/CherryFeatures.java | 38 +++++++-------- .../net/parsell/cherry/core/CherryItems.java | 37 ++++++++------ .../cherry/blockstates/cherry_planks.json | 5 ++ .../resources/assets/cherry/lang/en_us.json | 3 +- .../cherry/models/block/cherry_planks.json | 6 +++ .../cherry/models/item/cherry_planks.json | 3 ++ .../cherry/textures/block/cherry_planks.png | Bin 0 -> 14534 bytes .../{cherry_wood.json => cherry_logs.json} | 0 .../minecraft/tags/blocks/logs_that_burn.json | 2 +- .../data/minecraft/tags/blocks/planks.json | 6 +++ 12 files changed, 97 insertions(+), 56 deletions(-) create mode 100644 src/main/resources/assets/cherry/blockstates/cherry_planks.json create mode 100644 src/main/resources/assets/cherry/models/block/cherry_planks.json create mode 100644 src/main/resources/assets/cherry/models/item/cherry_planks.json create mode 100644 src/main/resources/assets/cherry/textures/block/cherry_planks.png rename src/main/resources/data/cherry/tags/blocks/{cherry_wood.json => cherry_logs.json} (100%) create mode 100644 src/main/resources/data/minecraft/tags/blocks/planks.json diff --git a/src/main/java/net/parsell/cherry/Cherry.java b/src/main/java/net/parsell/cherry/Cherry.java index 855a81f..c3159f6 100644 --- a/src/main/java/net/parsell/cherry/Cherry.java +++ b/src/main/java/net/parsell/cherry/Cherry.java @@ -1,10 +1,10 @@ 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.*; +import net.parsell.cherry.core.CherryBlocks; +import net.parsell.cherry.core.CherryFeatures; +import net.parsell.cherry.core.CherryItems; + public class Cherry implements ModInitializer { @Override diff --git a/src/main/java/net/parsell/cherry/core/CherryBlocks.java b/src/main/java/net/parsell/cherry/core/CherryBlocks.java index 9e5c2c0..751ec15 100644 --- a/src/main/java/net/parsell/cherry/core/CherryBlocks.java +++ b/src/main/java/net/parsell/cherry/core/CherryBlocks.java @@ -11,23 +11,34 @@ import net.minecraft.util.Identifier; 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 CHERRYLOG = registerPillar("cherry_log", FabricBlockSettings.copyOf(Blocks.OAK_LOG), 5, 5); + public static final Block CHERRYLEAVES = registerLeaves("cherry_leaves", FabricBlockSettings.copyOf(Blocks.OAK_LEAVES), 30, 60, 6649929); + public static final Block CHERRYPLANKS = registerBlock("cherry_planks", FabricBlockSettings.copyOf(Blocks.OAK_PLANKS), 5, 20); - 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!"); - 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); - } + private static Block registerBlock(String blockID, FabricBlockSettings settings, int burnChance, int burnSpread){ + Block block = new Block(settings); + Registry.register(Registry.BLOCK, new Identifier("cherry", blockID), block); + FlammableBlockRegistry.getDefaultInstance().add(block, burnChance, burnSpread); + return block; + } - public static void init(){ - registerBlocks(); - } + private static Block registerPillar(String blockID, FabricBlockSettings settings, int burnChance, int burnSpread){ + Block block = new PillarBlock(settings); + Registry.register(Registry.BLOCK, new Identifier("cherry", blockID), block); + FlammableBlockRegistry.getDefaultInstance().add(block, burnChance, burnSpread); + return block; + } + + private static Block registerLeaves(String blockID, FabricBlockSettings settings, int burnChance, int burnSpread, int color){ + Block block = new LeavesBlock(settings); + Registry.register(Registry.BLOCK, new Identifier("cherry", blockID), block); + FlammableBlockRegistry.getDefaultInstance().add(block, burnChance, burnSpread); + ColorProviderRegistry.BLOCK.register((state, world, pos, tintIndex) -> { + return color; + }, block); + return block; + } + + 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 950ae97..b943ab8 100644 --- a/src/main/java/net/parsell/cherry/core/CherryFeatures.java +++ b/src/main/java/net/parsell/cherry/core/CherryFeatures.java @@ -27,31 +27,31 @@ import net.minecraft.world.gen.trunk.StraightTrunkPlacer; import net.parsell.cherry.common.features.CherryTree; public class CherryFeatures { - private static final BlockState CHERRYLOG_STATE = CherryBlocks.CHERRYLOG.getDefaultState(); - private static final BlockState CHERRYLEAVES_STATE = CherryBlocks.CHERRYLEAVES.getDefaultState(); + private static final BlockState CHERRYLOG_STATE = CherryBlocks.CHERRYLOG.getDefaultState(); + private static final BlockState CHERRYLEAVES_STATE = CherryBlocks.CHERRYLEAVES.getDefaultState(); - // Create the features - private static final Feature CHERRY_TREE_1 = new CherryTree(DefaultFeatureConfig.CODEC); + // Create the features + private static final Feature CHERRY_TREE_1 = new CherryTree(DefaultFeatureConfig.CODEC); - // Configure the features - static TreeFeatureConfig CHERRY_TREE_1_CONFIG = new TreeFeatureConfig.Builder(new SimpleBlockStateProvider(CHERRYLOG_STATE), new SimpleBlockStateProvider(CHERRYLEAVES_STATE), new BlobFoliagePlacer(UniformIntDistribution.of(2), UniformIntDistribution.of(0), 3), new StraightTrunkPlacer(4, 2, 0), new TwoLayersFeatureSize(1, 0, 1)).ignoreVines().build(); - public static final ConfiguredFeature CHERRY_TREE_1_C = Feature.TREE.configure(CHERRY_TREE_1_CONFIG); - public static final ConfiguredFeature CHERRY_TREE_1_C_R = Feature.RANDOM_SELECTOR.configure(new RandomFeatureConfig(ImmutableList.of(CHERRY_TREE_1_C.withChance(0.8F)), CHERRY_TREE_1_C)).decorate(ConfiguredFeatures.Decorators.SQUARE_HEIGHTMAP).decorate(Decorator.COUNT_EXTRA.configure(new CountExtraDecoratorConfig(1, 0.1F, 1))); + // Configure the features + static TreeFeatureConfig CHERRY_TREE_1_CONFIG = new TreeFeatureConfig.Builder(new SimpleBlockStateProvider(CHERRYLOG_STATE), new SimpleBlockStateProvider(CHERRYLEAVES_STATE), new BlobFoliagePlacer(UniformIntDistribution.of(2), UniformIntDistribution.of(0), 3), new StraightTrunkPlacer(4, 2, 0), new TwoLayersFeatureSize(1, 0, 1)).ignoreVines().build(); + public static final ConfiguredFeature CHERRY_TREE_1_C = Feature.TREE.configure(CHERRY_TREE_1_CONFIG); + public static final ConfiguredFeature CHERRY_TREE_1_C_R = Feature.RANDOM_SELECTOR.configure(new RandomFeatureConfig(ImmutableList.of(CHERRY_TREE_1_C.withChance(0.8F)), CHERRY_TREE_1_C)).decorate(ConfiguredFeatures.Decorators.SQUARE_HEIGHTMAP).decorate(Decorator.COUNT_EXTRA.configure(new CountExtraDecoratorConfig(1, 0.1F, 1))); - private static void addFeatures(){ - // Register the features - Registry.register(Registry.FEATURE, new Identifier("cherry", "cherry_tree"), CHERRY_TREE_1); + private static void addFeatures(){ + // Register the features + Registry.register(Registry.FEATURE, new Identifier("cherry", "cherry_tree"), CHERRY_TREE_1); - // Register the configured features + // Register the configured features RegistryKey> cherryTree1 = RegistryKey.of(Registry.CONFIGURED_FEATURE_WORLDGEN, new Identifier("cherry", "cherry_tree_1")); - Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, cherryTree1.getValue(), CHERRY_TREE_1_C_R); + Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, cherryTree1.getValue(), CHERRY_TREE_1_C_R); - // Modify the biomes + // Modify the biomes BiomeModifications.addFeature(BiomeSelectors.includeByKey(BiomeKeys.FOREST), GenerationStep.Feature.VEGETAL_DECORATION, cherryTree1); - BiomeModifications.addFeature(BiomeSelectors.includeByKey(BiomeKeys.WOODED_HILLS), GenerationStep.Feature.VEGETAL_DECORATION, cherryTree1); - } + BiomeModifications.addFeature(BiomeSelectors.includeByKey(BiomeKeys.WOODED_HILLS), GenerationStep.Feature.VEGETAL_DECORATION, cherryTree1); + } - public static void init(){ - addFeatures(); - } + public static void init(){ + addFeatures(); + } } \ No newline at end of file diff --git a/src/main/java/net/parsell/cherry/core/CherryItems.java b/src/main/java/net/parsell/cherry/core/CherryItems.java index fc6ee03..945b5d8 100644 --- a/src/main/java/net/parsell/cherry/core/CherryItems.java +++ b/src/main/java/net/parsell/cherry/core/CherryItems.java @@ -2,26 +2,35 @@ 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.block.Block; import net.minecraft.item.BlockItem; import net.minecraft.item.ItemGroup; 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(){ + registerBlockItem("cherry_log", CherryBlocks.CHERRYLOG, ItemGroup.BUILDING_BLOCKS); + registerBlockItem("cherry_leaves", CherryBlocks.CHERRYLEAVES, ItemGroup.BUILDING_BLOCKS, 6649929); + registerBlockItem("cherry_planks", CherryBlocks.CHERRYPLANKS, 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"), CHERRYLEAVES_I); - System.out.println("Successfully added items!"); - ColorProviderRegistry.ITEM.register((stack, tintIndex) -> { - return 6649929; - }, CherryBlocks.CHERRYLEAVES - ); - } + // Register a standard blockItem + private static void registerBlockItem(String itemID, Block block, ItemGroup group){ + Registry.register(Registry.ITEM, new Identifier("cherry", itemID), new BlockItem(block, new FabricItemSettings().group(group))); + } - public static void init(){ - registerBlockItems(); - } + // Register a blockItem that require in-game color (leaves) + private static void registerBlockItem(String itemID, Block block, ItemGroup group, int color){ + BlockItem blockItem = new BlockItem(block, new FabricItemSettings().group(group)); + Registry.register(Registry.ITEM, new Identifier("cherry", itemID), blockItem); + ColorProviderRegistry.ITEM.register((stack, tintIndex) -> { + return color; + }, block + ); + } + + public static void init(){ + registerBlockItems(); + } } diff --git a/src/main/resources/assets/cherry/blockstates/cherry_planks.json b/src/main/resources/assets/cherry/blockstates/cherry_planks.json new file mode 100644 index 0000000..b482c75 --- /dev/null +++ b/src/main/resources/assets/cherry/blockstates/cherry_planks.json @@ -0,0 +1,5 @@ +{ + "variants": { + "": { "model": "cherry:block/cherry_planks" } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cherry/lang/en_us.json b/src/main/resources/assets/cherry/lang/en_us.json index a695e68..e35a38e 100644 --- a/src/main/resources/assets/cherry/lang/en_us.json +++ b/src/main/resources/assets/cherry/lang/en_us.json @@ -1,4 +1,5 @@ { "block.cherry.cherry_log": "Cherry Log", - "block.cherry.cherry_leaves": "Cherry Leaves" + "block.cherry.cherry_leaves": "Cherry Leaves", + "block.cherry.cherry_planks": "Cherry Planks" } \ No newline at end of file diff --git a/src/main/resources/assets/cherry/models/block/cherry_planks.json b/src/main/resources/assets/cherry/models/block/cherry_planks.json new file mode 100644 index 0000000..2cfacd4 --- /dev/null +++ b/src/main/resources/assets/cherry/models/block/cherry_planks.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "cherry:block/cherry_planks" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/cherry/models/item/cherry_planks.json b/src/main/resources/assets/cherry/models/item/cherry_planks.json new file mode 100644 index 0000000..5706e87 --- /dev/null +++ b/src/main/resources/assets/cherry/models/item/cherry_planks.json @@ -0,0 +1,3 @@ +{ + "parent": "cherry:block/cherry_planks" +} \ No newline at end of file diff --git a/src/main/resources/assets/cherry/textures/block/cherry_planks.png b/src/main/resources/assets/cherry/textures/block/cherry_planks.png new file mode 100644 index 0000000000000000000000000000000000000000..569b7533cc2c7fb0bf4f6dae7651e1e35e18062b GIT binary patch literal 14534 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 ND|UbQqF4ON{{d_YMa2LB literal 0 HcmV?d00001 diff --git a/src/main/resources/data/cherry/tags/blocks/cherry_wood.json b/src/main/resources/data/cherry/tags/blocks/cherry_logs.json similarity index 100% rename from src/main/resources/data/cherry/tags/blocks/cherry_wood.json rename to src/main/resources/data/cherry/tags/blocks/cherry_logs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json b/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json index b32d396..e00a231 100644 --- a/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json +++ b/src/main/resources/data/minecraft/tags/blocks/logs_that_burn.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#cherry:cherry_wood" + "#cherry:cherry_logs" ] } \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/planks.json b/src/main/resources/data/minecraft/tags/blocks/planks.json new file mode 100644 index 0000000..8bcf3fb --- /dev/null +++ b/src/main/resources/data/minecraft/tags/blocks/planks.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "cherry:cherry_planks" + ] +} \ No newline at end of file