Compare commits
2 commits
9188fcaef1
...
9f0e679dd1
Author | SHA1 | Date | |
---|---|---|---|
![]() |
9f0e679dd1 | ||
![]() |
ebc9f61f9b |
7 changed files with 123 additions and 20 deletions
|
@ -1,7 +1,9 @@
|
|||
package fr.sushi.charmsnfabrics;
|
||||
|
||||
import fr.sushi.charmsnfabrics.common.CnFRegistries;
|
||||
import net.neoforged.api.distmarker.Dist;
|
||||
import net.neoforged.bus.api.IEventBus;
|
||||
import net.neoforged.fml.common.EventBusSubscriber;
|
||||
import net.neoforged.fml.common.Mod;
|
||||
import net.neoforged.fml.config.ModConfig;
|
||||
import net.neoforged.fml.ModContainer;
|
||||
|
|
|
@ -1,11 +1,15 @@
|
|||
package fr.sushi.charmsnfabrics.client;
|
||||
|
||||
import fr.sushi.charmsnfabrics.CharmsAndFabrics;
|
||||
import fr.sushi.charmsnfabrics.client.datagen.CnFBlockLootProvider;
|
||||
import fr.sushi.charmsnfabrics.client.datagen.CnFBlockTagsProvider;
|
||||
import fr.sushi.charmsnfabrics.client.datagen.CnFModelProvider;
|
||||
import fr.sushi.charmsnfabrics.client.model.FlowerCrownModel;
|
||||
import fr.sushi.charmsnfabrics.client.renderer.FloralWorkbenchRenderer;
|
||||
import fr.sushi.charmsnfabrics.client.renderer.FlowerCrownRenderer;
|
||||
import fr.sushi.charmsnfabrics.common.CnFRegistries;
|
||||
import net.minecraft.data.loot.LootTableProvider;
|
||||
import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
|
||||
import net.neoforged.api.distmarker.Dist;
|
||||
import net.neoforged.bus.api.SubscribeEvent;
|
||||
import net.neoforged.fml.ModContainer;
|
||||
|
@ -13,12 +17,14 @@ import net.neoforged.fml.common.EventBusSubscriber;
|
|||
import net.neoforged.fml.common.Mod;
|
||||
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
|
||||
import net.neoforged.neoforge.client.event.EntityRenderersEvent;
|
||||
import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
|
||||
import net.neoforged.neoforge.client.gui.ConfigurationScreen;
|
||||
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
|
||||
import net.neoforged.neoforge.data.event.GatherDataEvent;
|
||||
import top.theillusivec4.curios.api.client.ICurioRenderer;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
@Mod(value = CharmsAndFabrics.MODID, dist = Dist.CLIENT)
|
||||
@EventBusSubscriber(modid = CharmsAndFabrics.MODID, value = Dist.CLIENT)
|
||||
public class CnFClient
|
||||
|
@ -57,12 +63,11 @@ public class CnFClient
|
|||
private static void onGatherClientData(final GatherDataEvent.Client event)
|
||||
{
|
||||
event.createProvider(CnFModelProvider::new);
|
||||
event.createProvider(
|
||||
(output, lookup) -> new LootTableProvider(output, Set.of(),
|
||||
List.of(new LootTableProvider.SubProviderEntry(
|
||||
CnFBlockLootProvider::new,
|
||||
LootContextParamSets.BLOCK)), lookup));
|
||||
event.createProvider(CnFBlockTagsProvider::new);
|
||||
}
|
||||
|
||||
// @SubscribeEvent
|
||||
// private static void onScreenAttach(RegisterMenuScreensEvent event)
|
||||
// {
|
||||
// event.register(CnFRegistries.MenuTypes.FLORAL_WB_MENU.get(),
|
||||
// FloralWorkbenchScreen::new);
|
||||
// }
|
||||
}
|
||||
|
|
|
@ -0,0 +1,31 @@
|
|||
package fr.sushi.charmsnfabrics.client.datagen;
|
||||
|
||||
import fr.sushi.charmsnfabrics.common.CnFRegistries;
|
||||
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 CnFBlockLootProvider extends BlockLootSubProvider
|
||||
{
|
||||
public CnFBlockLootProvider(HolderLookup.Provider registries)
|
||||
{
|
||||
super(Set.of(), FeatureFlags.DEFAULT_FLAGS, registries);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Iterable<Block> getKnownBlocks()
|
||||
{
|
||||
return CnFRegistries.Blocks.BLOCKS.getEntries().stream()
|
||||
.map(block -> (Block) block.get())
|
||||
.toList();
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void generate()
|
||||
{
|
||||
this.dropSelf(CnFRegistries.Blocks.FLORAL_WORKBENCH.get());
|
||||
}
|
||||
}
|
|
@ -0,0 +1,25 @@
|
|||
package fr.sushi.charmsnfabrics.client.datagen;
|
||||
|
||||
import fr.sushi.charmsnfabrics.CharmsAndFabrics;
|
||||
import fr.sushi.charmsnfabrics.common.CnFRegistries;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.data.PackOutput;
|
||||
import net.minecraft.tags.BlockTags;
|
||||
import net.neoforged.neoforge.common.data.BlockTagsProvider;
|
||||
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public class CnFBlockTagsProvider extends BlockTagsProvider
|
||||
{
|
||||
public CnFBlockTagsProvider(PackOutput output,
|
||||
CompletableFuture<HolderLookup.Provider> lookupProvider)
|
||||
{
|
||||
super(output, lookupProvider, CharmsAndFabrics.MODID);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void addTags(HolderLookup.Provider provider)
|
||||
{
|
||||
this.tag(BlockTags.MINEABLE_WITH_AXE).add(CnFRegistries.Blocks.FLORAL_WORKBENCH.get());
|
||||
}
|
||||
}
|
|
@ -12,8 +12,10 @@ 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.SoundType;
|
||||
import net.minecraft.world.level.block.entity.BlockEntityType;
|
||||
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||
import net.minecraft.world.level.material.MapColor;
|
||||
import net.neoforged.bus.api.IEventBus;
|
||||
import net.neoforged.neoforge.registries.DeferredBlock;
|
||||
import net.neoforged.neoforge.registries.DeferredHolder;
|
||||
|
@ -51,7 +53,12 @@ public class CnFRegistries
|
|||
.setId(ResourceKey.create(
|
||||
Registries.BLOCK,
|
||||
registry_name))
|
||||
.noOcclusion()));
|
||||
.noOcclusion()
|
||||
.mapColor(
|
||||
MapColor.WOOD)
|
||||
.strength(2.0f, 3.0f)
|
||||
.sound(SoundType.WOOD)
|
||||
.ignitedByLava()));
|
||||
}
|
||||
|
||||
public static class Tabs
|
||||
|
|
|
@ -5,10 +5,7 @@ import fr.sushi.charmsnfabrics.common.CnFRegistries;
|
|||
import fr.sushi.charmsnfabrics.common.entities.block.FloralWorkbenchBlockEntity;
|
||||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.Direction;
|
||||
import net.minecraft.world.Containers;
|
||||
import net.minecraft.world.InteractionHand;
|
||||
import net.minecraft.world.InteractionResult;
|
||||
import net.minecraft.world.MenuProvider;
|
||||
import net.minecraft.world.*;
|
||||
import net.minecraft.world.entity.player.Player;
|
||||
import net.minecraft.world.item.ItemStack;
|
||||
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||
|
@ -109,13 +106,17 @@ public class FloralWorkbench extends BaseEntityBlock
|
|||
if (!level.isClientSide())
|
||||
{
|
||||
IItemHandler handler = blockentity.getItemHandler();
|
||||
ItemStack crown = handler.getStackInSlot(0);
|
||||
|
||||
if (hasCrown && emptyHand)
|
||||
{
|
||||
Containers.dropItemStack(level, pos.getX(),
|
||||
pos.getY() + 1.0f, pos.getZ(), crown);
|
||||
ItemStack extracted = handler.extractItem(0, 1, false);
|
||||
if (!player.hasInfiniteMaterials())
|
||||
{
|
||||
Containers.dropItemStack(level, pos.getX(),
|
||||
pos.getY() + 1.0f, pos.getZ(), extracted);
|
||||
}
|
||||
blockentity.setChanged();
|
||||
level.sendBlockUpdated(pos, state, state, 3);
|
||||
return InteractionResult.SUCCESS_SERVER;
|
||||
}
|
||||
else if (stack.is(CnFRegistries.Items.FLOWER_CROWN.get()) &&
|
||||
|
@ -124,15 +125,18 @@ public class FloralWorkbench extends BaseEntityBlock
|
|||
handler.insertItem(0, stack.copy(), false);
|
||||
stack.consume(1, player);
|
||||
blockentity.setChanged();
|
||||
level.sendBlockUpdated(pos, state, state, 3);
|
||||
return InteractionResult.CONSUME;
|
||||
} else {
|
||||
return InteractionResult.FAIL;
|
||||
}
|
||||
else
|
||||
{
|
||||
return InteractionResult.PASS;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return hasCrown ^ emptyHand ? InteractionResult.SUCCESS :
|
||||
InteractionResult.FAIL;
|
||||
return !hasCrown ^ emptyHand ? InteractionResult.SUCCESS :
|
||||
InteractionResult.PASS;
|
||||
}
|
||||
}
|
||||
else
|
||||
|
|
|
@ -4,11 +4,16 @@ import fr.sushi.charmsnfabrics.common.CnFRegistries;
|
|||
import net.minecraft.core.BlockPos;
|
||||
import net.minecraft.core.HolderLookup;
|
||||
import net.minecraft.nbt.CompoundTag;
|
||||
import net.minecraft.network.Connection;
|
||||
import net.minecraft.network.protocol.Packet;
|
||||
import net.minecraft.network.protocol.game.ClientGamePacketListener;
|
||||
import net.minecraft.network.protocol.game.ClientboundBlockEntityDataPacket;
|
||||
import net.minecraft.util.RandomSource;
|
||||
import net.minecraft.world.level.block.entity.BlockEntity;
|
||||
import net.minecraft.world.level.block.state.BlockState;
|
||||
import net.neoforged.neoforge.items.IItemHandler;
|
||||
import net.neoforged.neoforge.items.ItemStackHandler;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
public class FloralWorkbenchBlockEntity extends BlockEntity
|
||||
{
|
||||
|
@ -39,6 +44,30 @@ public class FloralWorkbenchBlockEntity extends BlockEntity
|
|||
.ifPresent(tag -> itemHandler.deserializeNBT(levelRegistry, tag));
|
||||
}
|
||||
|
||||
@Override
|
||||
public CompoundTag getUpdateTag(HolderLookup.Provider registries)
|
||||
{
|
||||
CompoundTag tag = super.getUpdateTag(registries);
|
||||
tag.put("Inventory", itemHandler.serializeNBT(registries));
|
||||
return tag;
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public void handleUpdateTag(CompoundTag nbt,
|
||||
HolderLookup.Provider lookupProvider)
|
||||
{
|
||||
super.handleUpdateTag(nbt, lookupProvider);
|
||||
nbt.getCompound("Inventory")
|
||||
.ifPresent(tag -> itemHandler.deserializeNBT(lookupProvider, tag));
|
||||
}
|
||||
|
||||
@Override
|
||||
public @Nullable Packet<ClientGamePacketListener> getUpdatePacket()
|
||||
{
|
||||
return ClientboundBlockEntityDataPacket.create(this);
|
||||
}
|
||||
|
||||
public RandomSource getRandomSource()
|
||||
{
|
||||
return this.randomSource;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue