Merge pull request '1.20.1-feat-38-implement_composting' (#40) from 1.20.1-feat-38-implement_composting into 1.20.1
Reviewed-on: #40
This commit is contained in:
@ -4,7 +4,7 @@ org.gradle.daemon=false
|
||||
mod_id=firefly_bush_backport
|
||||
mod_name=Firefly Bush Backport
|
||||
mod_license=All Rights Reserved
|
||||
mod_version=1.0.0
|
||||
mod_version=1.1.0
|
||||
mod_group_id=dev.micle
|
||||
mod_authors=Micle
|
||||
mod_description=Firefly bush backport from 1.21.5.
|
||||
|
||||
@ -1,9 +1,6 @@
|
||||
package dev.micle.firefly_bush_backport.block;
|
||||
|
||||
import dev.micle.firefly_bush_backport.FireflyBushBackport;
|
||||
import dev.micle.firefly_bush_backport.item.ModItems;
|
||||
import net.minecraft.world.item.BlockItem;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraft.world.level.block.SoundType;
|
||||
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||
@ -14,12 +11,10 @@ import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
|
||||
import java.util.function.Supplier;
|
||||
|
||||
public class ModBlocks {
|
||||
public static final DeferredRegister<Block> BLOCKS = DeferredRegister.create(ForgeRegistries.BLOCKS, FireflyBushBackport.MOD_ID);
|
||||
|
||||
public static RegistryObject<Block> FIREFLY_BUSH = registerBlock("firefly_bush",
|
||||
public static RegistryObject<Block> FIREFLY_BUSH = BLOCKS.register("firefly_bush",
|
||||
() -> new FireflyBushBlock(BlockBehaviour.Properties.of()
|
||||
.mapColor(MapColor.PLANT)
|
||||
.ignitedByLava()
|
||||
@ -33,14 +28,4 @@ public class ModBlocks {
|
||||
public static void register(IEventBus modEventBus) {
|
||||
BLOCKS.register(modEventBus);
|
||||
}
|
||||
|
||||
private static <T extends Block> RegistryObject<Item> registerBlockItem(String name, RegistryObject<T> block) {
|
||||
return ModItems.ITEMS.register(name, () -> new BlockItem(block.get(), new Item.Properties()));
|
||||
}
|
||||
|
||||
private static <T extends Block> RegistryObject<T> registerBlock(String name, Supplier<T> block) {
|
||||
RegistryObject<T> ret = BLOCKS.register(name, block);
|
||||
registerBlockItem(name, ret);
|
||||
return ret;
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,15 +1,27 @@
|
||||
package dev.micle.firefly_bush_backport.item;
|
||||
|
||||
import dev.micle.firefly_bush_backport.FireflyBushBackport;
|
||||
import dev.micle.firefly_bush_backport.block.ModBlocks;
|
||||
import net.minecraft.world.item.BlockItem;
|
||||
import net.minecraft.world.item.Item;
|
||||
import net.minecraft.world.level.block.Block;
|
||||
import net.minecraftforge.eventbus.api.IEventBus;
|
||||
import net.minecraftforge.registries.DeferredRegister;
|
||||
import net.minecraftforge.registries.ForgeRegistries;
|
||||
import net.minecraftforge.registries.RegistryObject;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
public class ModItems {
|
||||
public static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, FireflyBushBackport.MOD_ID);
|
||||
|
||||
public static final RegistryObject<BlockItem> FIREFLY_BUSH = registerBlock(ModBlocks.FIREFLY_BUSH);
|
||||
|
||||
public static void register(IEventBus modEventBus) {
|
||||
ITEMS.register(modEventBus);
|
||||
}
|
||||
|
||||
private static RegistryObject<BlockItem> registerBlock(RegistryObject<Block> block) {
|
||||
return ITEMS.register(Objects.requireNonNull(block.getId()).getPath(), () -> new BlockItem(block.get(), new Item.Properties()));
|
||||
}
|
||||
}
|
||||
|
||||
@ -12,6 +12,7 @@ import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.level.Level;
|
||||
import net.minecraft.world.level.block.ComposterBlock;
|
||||
import net.minecraftforge.api.distmarker.Dist;
|
||||
import net.minecraftforge.api.distmarker.OnlyIn;
|
||||
import net.minecraftforge.client.event.RegisterParticleProvidersEvent;
|
||||
@ -47,7 +48,9 @@ public class Proxy implements IProxy {
|
||||
MinecraftForge.EVENT_BUS.addListener(Proxy::serverStopping);
|
||||
}
|
||||
|
||||
private static void setup(FMLCommonSetupEvent event) {}
|
||||
private static void setup(FMLCommonSetupEvent event) {
|
||||
ComposterBlock.COMPOSTABLES.put(ModItems.FIREFLY_BUSH.get().asItem(), 0.3F);
|
||||
}
|
||||
|
||||
private static void imcEnqueue(InterModEnqueueEvent event) {}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user