This commit is contained in:
parent
ebc9f61f9b
commit
9f0e679dd1
6 changed files with 91 additions and 19 deletions
|
@ -1,7 +1,9 @@
|
||||||
package fr.sushi.charmsnfabrics;
|
package fr.sushi.charmsnfabrics;
|
||||||
|
|
||||||
import fr.sushi.charmsnfabrics.common.CnFRegistries;
|
import fr.sushi.charmsnfabrics.common.CnFRegistries;
|
||||||
|
import net.neoforged.api.distmarker.Dist;
|
||||||
import net.neoforged.bus.api.IEventBus;
|
import net.neoforged.bus.api.IEventBus;
|
||||||
|
import net.neoforged.fml.common.EventBusSubscriber;
|
||||||
import net.neoforged.fml.common.Mod;
|
import net.neoforged.fml.common.Mod;
|
||||||
import net.neoforged.fml.config.ModConfig;
|
import net.neoforged.fml.config.ModConfig;
|
||||||
import net.neoforged.fml.ModContainer;
|
import net.neoforged.fml.ModContainer;
|
||||||
|
|
|
@ -1,11 +1,15 @@
|
||||||
package fr.sushi.charmsnfabrics.client;
|
package fr.sushi.charmsnfabrics.client;
|
||||||
|
|
||||||
import fr.sushi.charmsnfabrics.CharmsAndFabrics;
|
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.datagen.CnFModelProvider;
|
||||||
import fr.sushi.charmsnfabrics.client.model.FlowerCrownModel;
|
import fr.sushi.charmsnfabrics.client.model.FlowerCrownModel;
|
||||||
import fr.sushi.charmsnfabrics.client.renderer.FloralWorkbenchRenderer;
|
import fr.sushi.charmsnfabrics.client.renderer.FloralWorkbenchRenderer;
|
||||||
import fr.sushi.charmsnfabrics.client.renderer.FlowerCrownRenderer;
|
import fr.sushi.charmsnfabrics.client.renderer.FlowerCrownRenderer;
|
||||||
import fr.sushi.charmsnfabrics.common.CnFRegistries;
|
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.api.distmarker.Dist;
|
||||||
import net.neoforged.bus.api.SubscribeEvent;
|
import net.neoforged.bus.api.SubscribeEvent;
|
||||||
import net.neoforged.fml.ModContainer;
|
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.common.Mod;
|
||||||
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
|
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
|
||||||
import net.neoforged.neoforge.client.event.EntityRenderersEvent;
|
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.ConfigurationScreen;
|
||||||
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
|
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
|
||||||
import net.neoforged.neoforge.data.event.GatherDataEvent;
|
import net.neoforged.neoforge.data.event.GatherDataEvent;
|
||||||
import top.theillusivec4.curios.api.client.ICurioRenderer;
|
import top.theillusivec4.curios.api.client.ICurioRenderer;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
@Mod(value = CharmsAndFabrics.MODID, dist = Dist.CLIENT)
|
@Mod(value = CharmsAndFabrics.MODID, dist = Dist.CLIENT)
|
||||||
@EventBusSubscriber(modid = CharmsAndFabrics.MODID, value = Dist.CLIENT)
|
@EventBusSubscriber(modid = CharmsAndFabrics.MODID, value = Dist.CLIENT)
|
||||||
public class CnFClient
|
public class CnFClient
|
||||||
|
@ -57,12 +63,11 @@ public class CnFClient
|
||||||
private static void onGatherClientData(final GatherDataEvent.Client event)
|
private static void onGatherClientData(final GatherDataEvent.Client event)
|
||||||
{
|
{
|
||||||
event.createProvider(CnFModelProvider::new);
|
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.CreativeModeTabs;
|
||||||
import net.minecraft.world.item.Item;
|
import net.minecraft.world.item.Item;
|
||||||
import net.minecraft.world.level.block.Block;
|
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.entity.BlockEntityType;
|
||||||
import net.minecraft.world.level.block.state.BlockBehaviour;
|
import net.minecraft.world.level.block.state.BlockBehaviour;
|
||||||
|
import net.minecraft.world.level.material.MapColor;
|
||||||
import net.neoforged.bus.api.IEventBus;
|
import net.neoforged.bus.api.IEventBus;
|
||||||
import net.neoforged.neoforge.registries.DeferredBlock;
|
import net.neoforged.neoforge.registries.DeferredBlock;
|
||||||
import net.neoforged.neoforge.registries.DeferredHolder;
|
import net.neoforged.neoforge.registries.DeferredHolder;
|
||||||
|
@ -51,7 +53,12 @@ public class CnFRegistries
|
||||||
.setId(ResourceKey.create(
|
.setId(ResourceKey.create(
|
||||||
Registries.BLOCK,
|
Registries.BLOCK,
|
||||||
registry_name))
|
registry_name))
|
||||||
.noOcclusion()));
|
.noOcclusion()
|
||||||
|
.mapColor(
|
||||||
|
MapColor.WOOD)
|
||||||
|
.strength(2.0f, 3.0f)
|
||||||
|
.sound(SoundType.WOOD)
|
||||||
|
.ignitedByLava()));
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class Tabs
|
public static class Tabs
|
||||||
|
|
|
@ -5,10 +5,7 @@ import fr.sushi.charmsnfabrics.common.CnFRegistries;
|
||||||
import fr.sushi.charmsnfabrics.common.entities.block.FloralWorkbenchBlockEntity;
|
import fr.sushi.charmsnfabrics.common.entities.block.FloralWorkbenchBlockEntity;
|
||||||
import net.minecraft.core.BlockPos;
|
import net.minecraft.core.BlockPos;
|
||||||
import net.minecraft.core.Direction;
|
import net.minecraft.core.Direction;
|
||||||
import net.minecraft.world.Containers;
|
import net.minecraft.world.*;
|
||||||
import net.minecraft.world.InteractionHand;
|
|
||||||
import net.minecraft.world.InteractionResult;
|
|
||||||
import net.minecraft.world.MenuProvider;
|
|
||||||
import net.minecraft.world.entity.player.Player;
|
import net.minecraft.world.entity.player.Player;
|
||||||
import net.minecraft.world.item.ItemStack;
|
import net.minecraft.world.item.ItemStack;
|
||||||
import net.minecraft.world.item.context.BlockPlaceContext;
|
import net.minecraft.world.item.context.BlockPlaceContext;
|
||||||
|
@ -109,12 +106,15 @@ public class FloralWorkbench extends BaseEntityBlock
|
||||||
if (!level.isClientSide())
|
if (!level.isClientSide())
|
||||||
{
|
{
|
||||||
IItemHandler handler = blockentity.getItemHandler();
|
IItemHandler handler = blockentity.getItemHandler();
|
||||||
ItemStack crown = handler.getStackInSlot(0);
|
|
||||||
|
|
||||||
if (hasCrown && emptyHand)
|
if (hasCrown && emptyHand)
|
||||||
|
{
|
||||||
|
ItemStack extracted = handler.extractItem(0, 1, false);
|
||||||
|
if (!player.hasInfiniteMaterials())
|
||||||
{
|
{
|
||||||
Containers.dropItemStack(level, pos.getX(),
|
Containers.dropItemStack(level, pos.getX(),
|
||||||
pos.getY() + 1.0f, pos.getZ(), crown);
|
pos.getY() + 1.0f, pos.getZ(), extracted);
|
||||||
|
}
|
||||||
blockentity.setChanged();
|
blockentity.setChanged();
|
||||||
level.sendBlockUpdated(pos, state, state, 3);
|
level.sendBlockUpdated(pos, state, state, 3);
|
||||||
return InteractionResult.SUCCESS_SERVER;
|
return InteractionResult.SUCCESS_SERVER;
|
||||||
|
@ -127,14 +127,16 @@ public class FloralWorkbench extends BaseEntityBlock
|
||||||
blockentity.setChanged();
|
blockentity.setChanged();
|
||||||
level.sendBlockUpdated(pos, state, state, 3);
|
level.sendBlockUpdated(pos, state, state, 3);
|
||||||
return InteractionResult.CONSUME;
|
return InteractionResult.CONSUME;
|
||||||
} else {
|
}
|
||||||
return InteractionResult.FAIL;
|
else
|
||||||
|
{
|
||||||
|
return InteractionResult.PASS;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
return !hasCrown ^ emptyHand ? InteractionResult.SUCCESS :
|
return !hasCrown ^ emptyHand ? InteractionResult.SUCCESS :
|
||||||
InteractionResult.FAIL;
|
InteractionResult.PASS;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue