diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d new file mode 100644 index 0000000..d425272 --- /dev/null +++ b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d @@ -0,0 +1,2 @@ +// 1.21 2024-08-01T22:24:42.609971 Loot Tables +b82daccc5f953aaa0327a61f85766c8394427685 data/lingshi/loot_table/blocks/rice.json diff --git a/src/generated/resources/data/lingshi/loot_table/blocks/rice.json b/src/generated/resources/data/lingshi/loot_table/blocks/rice.json new file mode 100644 index 0000000..783a9fd --- /dev/null +++ b/src/generated/resources/data/lingshi/loot_table/blocks/rice.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:block", + "pools": [ + { + "bonus_rolls": 0.0, + "conditions": [ + { + "condition": "minecraft:survives_explosion" + } + ], + "entries": [ + { + "type": "minecraft:item", + "name": "lingshi:rice" + } + ], + "rolls": 1.0 + } + ], + "random_sequence": "lingshi:blocks/rice" +} \ No newline at end of file diff --git a/src/main/java/mczme/lingshi/Config.java b/src/main/java/mczme/lingshi/Config.java deleted file mode 100644 index 4278494..0000000 --- a/src/main/java/mczme/lingshi/Config.java +++ /dev/null @@ -1,63 +0,0 @@ -package mczme.lingshi; - -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.Item; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.fml.event.config.ModConfigEvent; -import net.neoforged.neoforge.common.ModConfigSpec; - -// An example config class. This is not required, but it's a good idea to have one to keep your config organized. -// Demonstrates how to use Neo's config APIs -@EventBusSubscriber(modid = ExampleMod.MODID, bus = EventBusSubscriber.Bus.MOD) -public class Config -{ - private static final ModConfigSpec.Builder BUILDER = new ModConfigSpec.Builder(); - - private static final ModConfigSpec.BooleanValue LOG_DIRT_BLOCK = BUILDER - .comment("Whether to log the dirt block on common setup") - .define("logDirtBlock", true); - - private static final ModConfigSpec.IntValue MAGIC_NUMBER = BUILDER - .comment("A magic number") - .defineInRange("magicNumber", 42, 0, Integer.MAX_VALUE); - - public static final ModConfigSpec.ConfigValue MAGIC_NUMBER_INTRODUCTION = BUILDER - .comment("What you want the introduction message to be for the magic number") - .define("magicNumberIntroduction", "The magic number is... "); - - // a list of strings that are treated as resource locations for items - private static final ModConfigSpec.ConfigValue> ITEM_STRINGS = BUILDER - .comment("A list of items to log on common setup.") - .defineListAllowEmpty("items", List.of("minecraft:iron_ingot"), Config::validateItemName); - - static final ModConfigSpec SPEC = BUILDER.build(); - - public static boolean logDirtBlock; - public static int magicNumber; - public static String magicNumberIntroduction; - public static Set items; - - private static boolean validateItemName(final Object obj) - { - return obj instanceof String itemName && BuiltInRegistries.ITEM.containsKey(ResourceLocation.parse(itemName)); - } - - @SubscribeEvent - static void onLoad(final ModConfigEvent event) - { - logDirtBlock = LOG_DIRT_BLOCK.get(); - magicNumber = MAGIC_NUMBER.get(); - magicNumberIntroduction = MAGIC_NUMBER_INTRODUCTION.get(); - - // convert the list of strings into a set of items - items = ITEM_STRINGS.get().stream() - .map(itemName -> BuiltInRegistries.ITEM.get(ResourceLocation.parse(itemName))) - .collect(Collectors.toSet()); - } -} diff --git a/src/main/java/mczme/lingshi/ExampleMod.java b/src/main/java/mczme/lingshi/ExampleMod.java deleted file mode 100644 index 07bbad4..0000000 --- a/src/main/java/mczme/lingshi/ExampleMod.java +++ /dev/null @@ -1,136 +0,0 @@ -package mczme.lingshi; - -import org.slf4j.Logger; - -import com.mojang.logging.LogUtils; - -import net.minecraft.client.Minecraft; -import net.minecraft.core.registries.BuiltInRegistries; -import net.minecraft.core.registries.Registries; -import net.minecraft.network.chat.Component; -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.state.BlockBehaviour; -import net.minecraft.world.level.material.MapColor; -import net.neoforged.api.distmarker.Dist; -import net.neoforged.bus.api.IEventBus; -import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.ModContainer; -import net.neoforged.fml.common.EventBusSubscriber; -import net.neoforged.fml.common.Mod; -import net.neoforged.fml.config.ModConfig; -import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent; -import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent; -import net.neoforged.neoforge.common.NeoForge; -import net.neoforged.neoforge.event.BuildCreativeModeTabContentsEvent; -import net.neoforged.neoforge.event.server.ServerStartingEvent; -import net.neoforged.neoforge.registries.DeferredBlock; -import net.neoforged.neoforge.registries.DeferredHolder; -import net.neoforged.neoforge.registries.DeferredItem; -import net.neoforged.neoforge.registries.DeferredRegister; - -// The value here should match an entry in the META-INF/neoforge.mods.toml file -@Mod(ExampleMod.MODID) -public class ExampleMod -{ - // Define mod id in a common place for everything to reference - public static final String MODID = "lingshi"; - // 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 - public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(MODID); - // Create a Deferred Register to hold Items which will all be registered under the "examplemod" namespace - public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(MODID); - // Create a Deferred Register to hold CreativeModeTabs which will all be registered under the "examplemod" 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 DeferredBlock EXAMPLE_BLOCK = BLOCKS.registerSimpleBlock("example_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 DeferredItem EXAMPLE_BLOCK_ITEM = ITEMS.registerSimpleBlockItem("example_block", EXAMPLE_BLOCK); - - // Creates a new food item with the id "examplemod:example_id", nutrition 1 and saturation 2 - public static final DeferredItem EXAMPLE_ITEM = ITEMS.registerSimpleItem("example_item", new Item.Properties().food(new FoodProperties.Builder() - .alwaysEdible().nutrition(1).saturationModifier(2f).build())); - - // Creates a creative tab with the id "examplemod:example_tab" for the example item, that is placed after the combat tab - public static final DeferredHolder EXAMPLE_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder() - .title(Component.translatable("itemGroup.examplemod")) //The language key for the title of your CreativeModeTab - .withTabsBefore(CreativeModeTabs.COMBAT) - .icon(() -> EXAMPLE_ITEM.get().getDefaultInstance()) - .displayItems((parameters, output) -> { - output.accept(EXAMPLE_ITEM.get()); // Add the example item to the tab. For your own tabs, this method is preferred over the event - }).build()); - - // The constructor for the mod class is the first code that is run when your mod is loaded. - // FML will recognize some parameter types like IEventBus or ModContainer and pass them in automatically. - public ExampleMod(IEventBus modEventBus, ModContainer modContainer) - { - // Register the commonSetup method for modloading - modEventBus.addListener(this::commonSetup); - - // Register the Deferred Register to the mod event bus so blocks get registered - BLOCKS.register(modEventBus); - // Register the Deferred Register to the mod event bus so items get registered - ITEMS.register(modEventBus); - // Register the Deferred Register to the mod event bus so tabs get registered - CREATIVE_MODE_TABS.register(modEventBus); - - // Register ourselves for server and other game events we are interested in. - // Note that this is necessary if and only if we want *this* class (ExampleMod) to respond directly to events. - // Do not add this line if there are no @SubscribeEvent-annotated functions in this class, like onServerStarting() below. - NeoForge.EVENT_BUS.register(this); - - // Register the item to a creative tab - modEventBus.addListener(this::addCreative); - - // Register our mod's ModConfigSpec so that FML can create and load the config file for us - modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC); - } - - private void commonSetup(final FMLCommonSetupEvent event) - { - // Some common setup code - LOGGER.info("HELLO FROM COMMON SETUP"); - - if (Config.logDirtBlock) - LOGGER.info("DIRT BLOCK >> {}", BuiltInRegistries.BLOCK.getKey(Blocks.DIRT)); - - LOGGER.info(Config.magicNumberIntroduction + Config.magicNumber); - - Config.items.forEach((item) -> LOGGER.info("ITEM >> {}", item.toString())); - } - - // Add the example block item to the building blocks tab - private void addCreative(BuildCreativeModeTabContentsEvent event) - { - if (event.getTabKey() == CreativeModeTabs.BUILDING_BLOCKS) - event.accept(EXAMPLE_BLOCK_ITEM); - } - - // You can use SubscribeEvent and let the Event Bus discover methods to call - @SubscribeEvent - public void onServerStarting(ServerStartingEvent event) - { - // Do something when the server starts - LOGGER.info("HELLO from server starting"); - } - - // You can use EventBusSubscriber to automatically register all static methods in the class annotated with @SubscribeEvent - @EventBusSubscriber(modid = MODID, bus = EventBusSubscriber.Bus.MOD, value = Dist.CLIENT) - public static class ClientModEvents - { - @SubscribeEvent - public static void onClientSetup(FMLClientSetupEvent event) - { - // Some client setup code - LOGGER.info("HELLO FROM CLIENT SETUP"); - LOGGER.info("MINECRAFT NAME >> {}", Minecraft.getInstance().getUser().getName()); - } - } -} diff --git a/src/main/java/mczme/lingshi/common/block/RiceSeedling.java b/src/main/java/mczme/lingshi/common/block/RiceSeedling.java new file mode 100644 index 0000000..5566664 --- /dev/null +++ b/src/main/java/mczme/lingshi/common/block/RiceSeedling.java @@ -0,0 +1,56 @@ +package mczme.lingshi.common.block; + +import com.mojang.serialization.MapCodec; +import net.minecraft.core.BlockPos; +import net.minecraft.server.level.ServerLevel; +import net.minecraft.util.RandomSource; +import net.minecraft.world.entity.player.Player; +import net.minecraft.world.level.BlockGetter; +import net.minecraft.world.level.Level; +import net.minecraft.world.level.LevelAccessor; +import net.minecraft.world.level.LevelReader; +import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.BonemealableBlock; +import net.minecraft.world.level.block.BushBlock; +import net.minecraft.world.level.block.LiquidBlockContainer; +import net.minecraft.world.level.block.state.BlockState; +import net.minecraft.world.level.material.Fluid; +import net.minecraft.world.level.material.FluidState; +import org.jetbrains.annotations.Nullable; + +public class RiceSeedling extends BushBlock implements BonemealableBlock, LiquidBlockContainer { + + public RiceSeedling(Properties properties) { + super(properties); + } + + @Override + protected MapCodec codec() { + return null; + } + + @Override + public boolean isValidBonemealTarget(LevelReader pLevel, BlockPos pPos, BlockState pState) { + return false; + } + + @Override + public boolean isBonemealSuccess(Level pLevel, RandomSource pRandom, BlockPos pPos, BlockState pState) { + return false; + } + + @Override + public void performBonemeal(ServerLevel pLevel, RandomSource pRandom, BlockPos pPos, BlockState pState) { + + } + + @Override + public boolean canPlaceLiquid(@Nullable Player pPlayer, BlockGetter pLevel, BlockPos pPos, BlockState pState, Fluid pFluid) { + return false; + } + + @Override + public boolean placeLiquid(LevelAccessor pLevel, BlockPos pPos, BlockState pState, FluidState pFluidState) { + return false; + } +} diff --git a/src/main/java/mczme/lingshi/common/createtab/CreateTabs.java b/src/main/java/mczme/lingshi/common/createtab/CreateTabs.java new file mode 100644 index 0000000..fe0ab5b --- /dev/null +++ b/src/main/java/mczme/lingshi/common/createtab/CreateTabs.java @@ -0,0 +1,28 @@ +package mczme.lingshi.common.createtab; + +import mczme.lingshi.common.registry.ModItems; +import net.minecraft.core.registries.Registries; +import net.minecraft.network.chat.Component; +import net.minecraft.world.item.CreativeModeTab; +import net.minecraft.world.item.CreativeModeTabs; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredHolder; +import net.neoforged.neoforge.registries.DeferredRegister; + +import static mczme.lingshi.lingshi.MODID; + +public class CreateTabs { + public static final DeferredRegister CREATIVE_MODE_TABS = DeferredRegister.create(Registries.CREATIVE_MODE_TAB, MODID); + public static final DeferredHolder LINGSHI_TAB = CREATIVE_MODE_TABS.register("example_tab", () -> CreativeModeTab.builder() + .title(Component.translatable("lingshi.lingshi_tab")) //The language key for the title of your CreativeModeTab + .withTabsBefore(CreativeModeTabs.COMBAT) + .icon(() -> ModItems.RICE.get().getDefaultInstance()) + .displayItems((parameters, output) -> { + output.accept(ModItems.RICE.get()); + output.accept(ModItems.RICE_SEEDING.get()); + }).build()); + + public static void register(IEventBus modEventBus) { + CREATIVE_MODE_TABS.register(modEventBus); + } +} diff --git a/src/main/java/mczme/lingshi/common/data/DataGenerators.java b/src/main/java/mczme/lingshi/common/data/DataGenerators.java new file mode 100644 index 0000000..1c6453e --- /dev/null +++ b/src/main/java/mczme/lingshi/common/data/DataGenerators.java @@ -0,0 +1,36 @@ +package mczme.lingshi.common.data; + +import mczme.lingshi.common.data.loot.BlockLoot; +import mczme.lingshi.lingshi; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.PackOutput; +import net.minecraft.data.loot.LootTableProvider; +import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.data.event.GatherDataEvent; + +import java.util.List; +import java.util.Set; +import java.util.concurrent.CompletableFuture; + +@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD, modid = lingshi.MODID) +public class DataGenerators { + + @SubscribeEvent + public static void onGatherData(GatherDataEvent event) { + + DataGenerator generator = event.getGenerator(); + PackOutput output = generator.getPackOutput(); + ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); + CompletableFuture lookupProvider = event.getLookupProvider(); + +// block loot + event.getGenerator().addProvider( + event.includeServer(), + new LootTableProvider(output, Set.of(), List.of(new LootTableProvider.SubProviderEntry(BlockLoot::new, LootContextParamSets.BLOCK)),lookupProvider) + ); + } +} diff --git a/src/main/java/mczme/lingshi/common/data/loot/BlockLoot.java b/src/main/java/mczme/lingshi/common/data/loot/BlockLoot.java new file mode 100644 index 0000000..a419d07 --- /dev/null +++ b/src/main/java/mczme/lingshi/common/data/loot/BlockLoot.java @@ -0,0 +1,31 @@ +package mczme.lingshi.common.data.loot; + +import mczme.lingshi.common.registry.ModBlocks; +import net.minecraft.core.HolderLookup; +import net.minecraft.data.loot.BlockLootSubProvider; +import net.minecraft.world.flag.FeatureFlags; +import net.minecraft.world.level.block.Block; + +import java.util.Set; + +public class BlockLoot extends BlockLootSubProvider { + + public static final Set BLOCK = Set.of( + ModBlocks.RICE.get() + ); + + public BlockLoot(HolderLookup.Provider lookupProvider) { + super(Set.of(), FeatureFlags.DEFAULT_FLAGS,lookupProvider); + } + + + @Override + protected void generate() { + this.dropSelf(ModBlocks.RICE.get()); + } + + @Override + protected Iterable getKnownBlocks() { + return BLOCK; + } +} diff --git a/src/main/java/mczme/lingshi/common/registry/ModBlocks.java b/src/main/java/mczme/lingshi/common/registry/ModBlocks.java new file mode 100644 index 0000000..697fe88 --- /dev/null +++ b/src/main/java/mczme/lingshi/common/registry/ModBlocks.java @@ -0,0 +1,31 @@ +package mczme.lingshi.common.registry; + +import mczme.lingshi.common.block.RiceSeedling; +import mczme.lingshi.lingshi; +import net.minecraft.world.level.block.CropBlock; +import net.minecraft.world.level.block.SoundType; +import net.minecraft.world.level.block.state.BlockBehaviour; +import net.minecraft.world.level.material.MapColor; +import net.minecraft.world.level.material.PushReaction; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; + +import java.util.function.Supplier; + +public class ModBlocks { + public static final DeferredRegister.Blocks BLOCKS = DeferredRegister.createBlocks(lingshi.MODID); + + public static final Supplier RICE = BLOCKS.registerBlock("rice", CropBlock::new, + BlockBehaviour.Properties.of().mapColor(MapColor.PLANT) + .noCollission() + .randomTicks() + .instabreak() + .sound(SoundType.CROP) + .pushReaction(PushReaction.DESTROY)); + public static final Supplier RICE_SEEDING = BLOCKS.registerBlock("rice_seeding", RiceSeedling::new, + BlockBehaviour.Properties.of()); + + public static void register(IEventBus modEventBus) { + BLOCKS.register(modEventBus); + } +} diff --git a/src/main/java/mczme/lingshi/common/registry/ModItems.java b/src/main/java/mczme/lingshi/common/registry/ModItems.java new file mode 100644 index 0000000..03d834f --- /dev/null +++ b/src/main/java/mczme/lingshi/common/registry/ModItems.java @@ -0,0 +1,20 @@ +package mczme.lingshi.common.registry; + +import mczme.lingshi.lingshi; +import net.minecraft.world.item.BlockItem; +import net.minecraft.world.item.Item; +import net.neoforged.bus.api.IEventBus; +import net.neoforged.neoforge.registries.DeferredRegister; + +import java.util.function.Supplier; + +public class ModItems { + public static final DeferredRegister.Items ITEMS = DeferredRegister.createItems(lingshi.MODID); + + public static final Supplier RICE = ITEMS.registerSimpleBlockItem("rice", ModBlocks.RICE, new Item.Properties()); + public static final Supplier RICE_SEEDING =ITEMS.registerSimpleBlockItem("rice_seeding", ModBlocks.RICE_SEEDING, new Item.Properties()); + + public static void register(IEventBus modEventBus) { + ITEMS.register(modEventBus); + } +} diff --git a/src/main/java/mczme/lingshi/lingshi.java b/src/main/java/mczme/lingshi/lingshi.java new file mode 100644 index 0000000..f5bf3c5 --- /dev/null +++ b/src/main/java/mczme/lingshi/lingshi.java @@ -0,0 +1,33 @@ +package mczme.lingshi; + +import mczme.lingshi.common.createtab.CreateTabs; +import mczme.lingshi.common.registry.ModBlocks; +import mczme.lingshi.common.registry.ModItems; +import org.slf4j.Logger; + +import com.mojang.logging.LogUtils; + +import net.neoforged.bus.api.IEventBus; +import net.neoforged.fml.ModContainer; +import net.neoforged.fml.common.Mod; + + +@Mod(lingshi.MODID) +public class lingshi +{ + public static final String MODID = "lingshi"; + private static final Logger LOGGER = LogUtils.getLogger(); + + + // The constructor for the mod class is the first code that is run when your mod is loaded. + // FML will recognize some parameter types like IEventBus or ModContainer and pass them in automatically. + public lingshi(IEventBus modEventBus, ModContainer modContainer) + { + ModBlocks.register(modEventBus); + ModItems.register(modEventBus); + CreateTabs.register(modEventBus); + + } + + +} diff --git a/src/main/resources/assets/lingshi/lang/zh_cn.json b/src/main/resources/assets/lingshi/lang/zh_cn.json new file mode 100644 index 0000000..748e3d9 --- /dev/null +++ b/src/main/resources/assets/lingshi/lang/zh_cn.json @@ -0,0 +1,5 @@ +{ + "lingshi.lingshi_tab": "灵食", + "block.lingshi.rice": "稻米", + "block.lingshi.rice_seeding": "稻苗" +} \ No newline at end of file