Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions src/main/java/com/altnoir/poopsky/PSItemGroups.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import com.altnoir.poopsky.block.PSBlocks;
import com.altnoir.poopsky.block.AllToiletBlocks;
import com.altnoir.poopsky.item.PSItems;
import com.altnoir.poopsky.item.p.FlyItem;
import com.altnoir.poopsky.init.PFlyTypes;
import net.minecraft.core.registries.Registries;
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.BlockItem;
Expand All @@ -27,6 +29,7 @@ public class PSItemGroups {
PSItems.ITEMS.getEntries().stream()
.map(DeferredHolder::get)
.filter(item -> !(item instanceof BlockItem))
.filter(item -> !(item instanceof FlyItem))
.forEach(output::accept);

Set<Block> skip = Set.of(
Expand All @@ -43,6 +46,10 @@ public class PSItemGroups {
.filter(block -> !skip.contains(block))
.forEach(output::accept);

for (var type : PFlyTypes.getAll().values()) {
output.accept(FlyItem.withType(type));
}

AllToiletBlocks.BLOCKS.getEntries().stream()
.map(DeferredHolder::get)
.forEach(output::accept);
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/com/altnoir/poopsky/PoopSky.java
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
import com.altnoir.poopsky.worldgen.PSStructures;
import com.altnoir.poopsky.worldgen.foliage.PSFoliagePlacerTypes;
import com.mojang.logging.LogUtils;
import net.neoforged.neoforge.capabilities.Capabilities;
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.dispenser.BlockSource;
Expand Down Expand Up @@ -67,6 +69,9 @@ public PoopSky(IEventBus modEventBus, ModContainer modContainer) {
PFluids.FLUIDS.register(modEventBus);
PFluidTypes.FLUID_TYPES.register(modEventBus);


PMenuTypes.register(modEventBus);

modContainer.registerConfig(ModConfig.Type.COMMON, Config.SPEC);
}

Expand Down
30 changes: 24 additions & 6 deletions src/main/java/com/altnoir/poopsky/PoopSkyClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,35 +2,37 @@

import com.altnoir.poopsky.block.PSBlocks;
import com.altnoir.poopsky.block.abs.AbstractCompooperBlock;
import com.altnoir.poopsky.init.PEntityType;
import com.altnoir.poopsky.init.*;
import com.altnoir.poopsky.entity.renderer.*;
import com.altnoir.poopsky.event.PSClientGameEvents;
import com.altnoir.poopsky.event.PSClientModEvents;
import com.altnoir.poopsky.event.PSKeyBoardInput;
import com.altnoir.poopsky.init.PFluidTypes;
import com.altnoir.poopsky.init.PParticles;
import com.altnoir.poopsky.init.PRecipes;
import com.altnoir.poopsky.inventory.BreedingBoxScreen;
import com.altnoir.poopsky.inventory.FlyNestScreen;
import com.altnoir.poopsky.item.PSItems;
import com.altnoir.poopsky.misc.particle.PoopParticle;
import net.minecraft.client.renderer.BiomeColors;
import net.minecraft.client.renderer.RenderType;
import net.minecraft.client.RecipeBookCategories;
import net.minecraft.client.renderer.item.ItemProperties;
import net.minecraft.resources.ResourceLocation;
import net.neoforged.api.distmarker.Dist;
import net.neoforged.bus.api.IEventBus;
import net.neoforged.fml.ModContainer;
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.RegisterColorHandlersEvent;
import net.neoforged.neoforge.client.event.RegisterNamedRenderTypesEvent;
import net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent;
import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
import net.neoforged.neoforge.client.event.RegisterRecipeBookCategoriesEvent;
import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions;
import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent;
import net.neoforged.neoforge.client.gui.ConfigurationScreen;
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
import net.neoforged.neoforge.common.NeoForge;
import org.jetbrains.annotations.NotNull;

@Mod(value = PoopSky.MOD_ID, dist = Dist.CLIENT)
public class PoopSkyClient {
public PoopSkyClient(IEventBus modEventBus, ModContainer modContainer) {
Expand All @@ -43,6 +45,7 @@ public PoopSkyClient(IEventBus modEventBus, ModContainer modContainer) {

public static void registerMod(IEventBus modEventBus) {
modEventBus.addListener(PSClientModEvents::registerLayers);
modEventBus.addListener(ClientModEvents::registerItemProperties);
modEventBus.addListener(PSClientModEvents::registerBlockEntityRenderers);
modEventBus.addListener(PSKeyBoardInput::onRegisterKeyMappings);
modEventBus.addListener(ClientModEvents::registerRenderTypes);
Expand All @@ -53,6 +56,7 @@ public static void registerMod(IEventBus modEventBus) {
modEventBus.addListener(ClientModEvents::onRegisterItemColors);
modEventBus.addListener(ClientModEvents::onRegisterBlockRenderBuffers);
modEventBus.addListener(ClientModEvents::registerClientExtensions);
modEventBus.addListener(ClientModEvents::registerMenuScreens);
}

public static void registerGame(IEventBus modEventBus) {
Expand All @@ -61,6 +65,13 @@ public static void registerGame(IEventBus modEventBus) {
}

public static class ClientModEvents {
public static void registerItemProperties(FMLClientSetupEvent event) {
event.enqueueWork(() -> {
ItemProperties.register(PSItems.FLY.get(), PoopSky.loc("fly_type"),
(stack, level, entity, seed) -> (float) PFlyTypes.getIndex(PFlyTypes.byId(stack.get(PComponents.FLY_TYPE.get()))));
});
}

public static void registerRenderTypes(RegisterNamedRenderTypesEvent event) {
event.register(PoopSky.loc("poop_empty_log"), RenderType.cutout(), RenderType.entityCutout(PSBlocks.POOP_EMPTY_LOG.getId()));
}
Expand All @@ -74,8 +85,15 @@ public static void registerEntityRenderers(EntityRenderersEvent.RegisterRenderer
event.registerEntityRenderer(PEntityType.POOP_TNT.get(), PoopTntRenderer::new);
}

public static void registerMenuScreens(RegisterMenuScreensEvent event) {
event.register(PMenuTypes.FLY_NEST.get(), FlyNestScreen::new);
event.register(PMenuTypes.BREEDING_BOX.get(), BreedingBoxScreen::new);
}

public static void registerRecipeBookCategories(RegisterRecipeBookCategoriesEvent event) {
event.registerRecipeCategoryFinder(PRecipes.SIEVE_TYPE.get(), recipe -> RecipeBookCategories.UNKNOWN);
event.registerRecipeCategoryFinder(PRecipes.FLY_NEST_TYPE.get(), recipe -> RecipeBookCategories.UNKNOWN);
event.registerRecipeCategoryFinder(PRecipes.BREEDING_BOX_TYPE.get(), recipe -> RecipeBookCategories.UNKNOWN);
}

public static void registerParticleProviders(RegisterParticleProvidersEvent event) {
Expand Down Expand Up @@ -123,4 +141,4 @@ public ResourceLocation getOverlayTexture() {
}, PFluidTypes.POOP_FLUID_TYPE.get());
}
}
}
}
21 changes: 21 additions & 0 deletions src/main/java/com/altnoir/poopsky/block/PSBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,26 @@ public class PSBlocks {
)
);

// ——— 苍蝇系统 ———
public static final DeferredBlock<Block> FLY_NEST = registerDefaultBlock("fly_nest",
() -> new FlyNestBlock(BlockBehaviour.Properties.of()
.mapColor(MapColor.COLOR_BROWN)
.strength(0.5F)
.sound(SoundType.WOOD)
.noOcclusion()
)
);

public static final DeferredBlock<Block> BREEDING_BOX = registerDefaultBlock("breeding_box",
() -> new BreedingBoxBlock(BlockBehaviour.Properties.of()
.mapColor(MapColor.COLOR_BROWN)
.strength(1.0F)
.sound(SoundType.WOOD)
.noOcclusion()
)
);


private static BlockBehaviour.Properties poopCakeProperties() {
return BlockBehaviour.Properties.of()
.forceSolidOn()
Expand Down Expand Up @@ -633,3 +653,4 @@ public static void register(IEventBus eventBus) {
BLOCKS.register(eventBus);
}
}

Loading