From 6e20ad09b42cac69e6d57eaf065f1a5636de56df Mon Sep 17 00:00:00 2001 From: AnnsAnn Date: Fri, 27 Oct 2023 19:04:18 +0200 Subject: [PATCH] First working Forge version --- .../{flowerpower => flower_power}/Config.java | 2 +- .../FlowerPower.java | 31 ++++++++++--------- .../models/block/black_petals_1.json | 1 + .../models/block/yellow_petals_1.json | 1 + .../models/block/yellow_petals_2.json | 1 + .../models/block/yellow_petals_3.json | 1 + .../models/block/yellow_petals_4.json | 1 + 7 files changed, 22 insertions(+), 16 deletions(-) rename forge/src/main/java/eu/annsann/{flowerpower => flower_power}/Config.java (98%) rename forge/src/main/java/eu/annsann/{flowerpower => flower_power}/FlowerPower.java (78%) diff --git a/forge/src/main/java/eu/annsann/flowerpower/Config.java b/forge/src/main/java/eu/annsann/flower_power/Config.java similarity index 98% rename from forge/src/main/java/eu/annsann/flowerpower/Config.java rename to forge/src/main/java/eu/annsann/flower_power/Config.java index 8c5228b..1bf90ed 100644 --- a/forge/src/main/java/eu/annsann/flowerpower/Config.java +++ b/forge/src/main/java/eu/annsann/flower_power/Config.java @@ -1,4 +1,4 @@ -package eu.annsann.flowerpower; +package eu.annsann.flower_power; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.Item; diff --git a/forge/src/main/java/eu/annsann/flowerpower/FlowerPower.java b/forge/src/main/java/eu/annsann/flower_power/FlowerPower.java similarity index 78% rename from forge/src/main/java/eu/annsann/flowerpower/FlowerPower.java rename to forge/src/main/java/eu/annsann/flower_power/FlowerPower.java index 8020be4..5ad605c 100644 --- a/forge/src/main/java/eu/annsann/flowerpower/FlowerPower.java +++ b/forge/src/main/java/eu/annsann/flower_power/FlowerPower.java @@ -1,17 +1,17 @@ -package eu.annsann.flowerpower; +package eu.annsann.flower_power; import com.mojang.logging.LogUtils; import net.minecraft.client.Minecraft; import net.minecraft.core.registries.Registries; -import net.minecraft.world.food.FoodProperties; import net.minecraft.world.item.BlockItem; import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTabs; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.PinkPetalsBlock; +import net.minecraft.world.level.block.SoundType; import net.minecraft.world.level.block.state.BlockBehaviour; -import net.minecraft.world.level.material.MapColor; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.BuildCreativeModeTabContentsEvent; @@ -37,24 +37,25 @@ public class FlowerPower public static final String MODID = "flower_power"; // Directly reference a slf4j logger private static final Logger LOGGER = LogUtils.getLogger(); - // Create a Deferred Register to hold Blocks which will all be registered under the "examplemod" namespace + // Create a Deferred Register to hold Blocks which will all be registered under the "flower_power" namespace public static final DeferredRegister BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, MODID); - // Create a Deferred Register to hold Items which will all be registered under the "examplemod" namespace + // Create a Deferred Register to hold Items which will all be registered under the "flower_power" namespace public static final DeferredRegister ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID); - // Create a Deferred Register to hold CreativeModeTabs which will all be registered under the "examplemod" namespace + // Create a Deferred Register to hold CreativeModeTabs which will all be registered under the "flower_power" namespace public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID); - // Creates a new Block with the id "examplemod:example_block", combining the namespace and path - public static final RegistryObject EXAMPLE_BLOCK = BLOCKS.register("yellow_petals", () -> new Block(BlockBehaviour.Properties.of().mapColor(MapColor.STONE))); - // Creates a new BlockItem with the id "examplemod:example_block", combining the namespace and path - public static final RegistryObject EXAMPLE_BLOCK_ITEM = ITEMS.register("yellow_petals", () -> new BlockItem(EXAMPLE_BLOCK.get(), new Item.Properties())); + // Creates a new Block with the id "flower_power:example_block", combining the namespace and path + public static final RegistryObject YELLOW_PETALS_BLOCK = BLOCKS.register("yellow_petals", () -> new PinkPetalsBlock(BlockBehaviour.Properties.of().sound(SoundType.PINK_PETALS).noCollission())); + // Creates a new BlockItem with the id "flower_power:example_block", combining the namespace and path - // Creates a creative tab with the id "examplemod:example_tab" for the example item, that is placed after the combat tab - public static final RegistryObject EXAMPLE_TAB = CREATIVE_MODE_TABS.register("flower_power", () -> CreativeModeTab.builder() + public static final RegistryObject YELLOW_PETALS_ITEM = ITEMS.register("yellow_petals", () -> new BlockItem(YELLOW_PETALS_BLOCK.get(), new Item.Properties())); + + // Creates a creative tab with the id "flower_power:example_tab" for the example item, that is placed after the combat tab + public static final RegistryObject CREATIVE_TAB = CREATIVE_MODE_TABS.register("flower_power", () -> CreativeModeTab.builder() .withTabsBefore(CreativeModeTabs.COMBAT) - .icon(() -> EXAMPLE_BLOCK_ITEM.get().getDefaultInstance()) + .icon(() -> YELLOW_PETALS_ITEM.get().getDefaultInstance()) .displayItems((parameters, output) -> { - output.accept(EXAMPLE_BLOCK_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event + output.accept(YELLOW_PETALS_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event }).build()); public FlowerPower() @@ -95,7 +96,7 @@ private void commonSetup(final FMLCommonSetupEvent event) private void addCreative(BuildCreativeModeTabContentsEvent event) { if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS) - event.accept(EXAMPLE_BLOCK_ITEM); + event.accept(YELLOW_PETALS_ITEM); } // You can use SubscribeEvent and let the Event Bus discover methods to call diff --git a/shared/assets/flower_power/models/block/black_petals_1.json b/shared/assets/flower_power/models/block/black_petals_1.json index bf62edc..2829084 100644 --- a/shared/assets/flower_power/models/block/black_petals_1.json +++ b/shared/assets/flower_power/models/block/black_petals_1.json @@ -1,5 +1,6 @@ { "parent": "minecraft:block/flowerbed_1", + "render_type": "cutout", "textures": { "flowerbed": "flower_power:block/black_petals", "stem": "flower_power:block/red_petals_stem" diff --git a/shared/assets/flower_power/models/block/yellow_petals_1.json b/shared/assets/flower_power/models/block/yellow_petals_1.json index ca529d1..88cacfb 100644 --- a/shared/assets/flower_power/models/block/yellow_petals_1.json +++ b/shared/assets/flower_power/models/block/yellow_petals_1.json @@ -1,5 +1,6 @@ { "parent": "minecraft:block/flowerbed_1", + "render_type": "cutout", "textures": { "flowerbed": "flower_power:block/yellow_petals", "stem": "flower_power:block/red_petals_stem" diff --git a/shared/assets/flower_power/models/block/yellow_petals_2.json b/shared/assets/flower_power/models/block/yellow_petals_2.json index 05cf681..8b4e0cb 100644 --- a/shared/assets/flower_power/models/block/yellow_petals_2.json +++ b/shared/assets/flower_power/models/block/yellow_petals_2.json @@ -1,5 +1,6 @@ { "parent": "minecraft:block/flowerbed_2", + "render_type": "cutout", "textures": { "flowerbed": "flower_power:block/yellow_petals", "stem": "flower_power:block/red_petals_stem" diff --git a/shared/assets/flower_power/models/block/yellow_petals_3.json b/shared/assets/flower_power/models/block/yellow_petals_3.json index 987bc08..974a404 100644 --- a/shared/assets/flower_power/models/block/yellow_petals_3.json +++ b/shared/assets/flower_power/models/block/yellow_petals_3.json @@ -1,5 +1,6 @@ { "parent": "minecraft:block/flowerbed_3", + "render_type": "cutout", "textures": { "flowerbed": "flower_power:block/yellow_petals", "stem": "flower_power:block/red_petals_stem" diff --git a/shared/assets/flower_power/models/block/yellow_petals_4.json b/shared/assets/flower_power/models/block/yellow_petals_4.json index ef9e7ce..2735ec4 100644 --- a/shared/assets/flower_power/models/block/yellow_petals_4.json +++ b/shared/assets/flower_power/models/block/yellow_petals_4.json @@ -1,5 +1,6 @@ { "parent": "minecraft:block/flowerbed_4", + "render_type": "cutout", "textures": { "flowerbed": "flower_power:block/yellow_petals", "stem": "flower_power:block/red_petals_stem"