Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Extract particle spawner logic from tater blocks #182

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Extract particle spawner logic from tater blocks #182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
75dbf06
Extract particle spawner logic from tater blocks
haykam821 Jul 2, 2024
2cdb81d
Merge branch 'main' into tater-particle-spawners
haykam821 Nov 13, 2024
e05ae68
Fix null particles being spawned
haykam821 Nov 13, 2024
02de67c
Fix corruptater particles spawning twice as fast
haykam821 Nov 13, 2024
1961b0c
Add codecs for tater blocks
haykam821 Nov 13, 2024
f7ae787
Add codecs for tater particle spawners
haykam821 Nov 13, 2024
8418035
Expose dynamic tater particle spawner fields to all child codecs
haykam821 Nov 13, 2024
1758057
Expose tater particle spawner fields to all tater block codecs
haykam821 Nov 14, 2024
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
72 changes: 52 additions & 20 deletions src/main/java/xyz/nucleoid/extras/lobby/NEBlocks.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@
import net.minecraft.block.entity.BlockEntityType;
import net.minecraft.block.piston.PistonBehavior;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.item.Items;
import net.minecraft.particle.BlockStateParticleEffect;
import net.minecraft.particle.DustParticleEffect;
import net.minecraft.particle.ItemStackParticleEffect;
import net.minecraft.particle.ParticleEffect;
import net.minecraft.particle.ParticleTypes;
import net.minecraft.registry.Registries;
Expand All @@ -27,8 +29,10 @@
import xyz.nucleoid.extras.NucleoidExtras;
import xyz.nucleoid.extras.lobby.block.*;
import xyz.nucleoid.extras.lobby.block.tater.*;
import xyz.nucleoid.extras.lobby.particle.*;

import java.util.function.Function;
import com.mojang.serialization.MapCodec;

public class NEBlocks {
public static final Block NUCLEOID_LOGO = registerTaterBlock("nucleoid_logo", ParticleTypes.GLOW_SQUID_INK, "bac7400dfcb9a387361a3ad7c296943eb841a9bda13ad89558e2d6efebf167bc");
Expand Down Expand Up @@ -80,7 +84,7 @@ public class NEBlocks {
public static final Block TRANSIENT_WARPED_DOOR = register("transient_warped_door", AbstractBlock.Settings.copy(Blocks.WARPED_DOOR), settings -> new TransientDoorBlock(Blocks.WARPED_DOOR, settings));
// pale oak

public static final Block NUCLE_PAST_LOGO = registerTaterBlock("nucle_past_logo", new DustParticleEffect(0x52C471, 1), "65ed3e4d6ec42bd84d2b5e452087d454aac141a978540f6d200bd8aa863d4db8");
public static final Block NUCLE_PAST_LOGO = registerColorTaterBlock("nucle_past_logo", 0x52C471, "65ed3e4d6ec42bd84d2b5e452087d454aac141a978540f6d200bd8aa863d4db8");

public static final Block TINY_POTATO = registerTaterBlock("tiny_potato", ParticleTypes.HEART, "573514a23245f15dbad5fb4e622163020864cce4c15d56de3adb90fa5a7137fd");
public static final Block BOTANICAL_TINY_POTATO = registerBotanicTaterBlock("botanical_potato", ParticleTypes.HEART,
Expand Down Expand Up @@ -208,7 +212,7 @@ public class NEBlocks {
public static final Block LAPIS_TATER = registerTaterBlock("lapis_tater", Blocks.LAPIS_BLOCK, "58d5cbda5c5046bf0b0f0d447c2fcc5e468707b6a4837c083af8e109aba9ce1c");
public static final Block NETHERITE_TATER = registerTaterBlock("netherite_tater", Blocks.NETHERITE_BLOCK, "664dce4fade8e5f352001eff6900d9d4b142935ebed303106539f7ad0193621f");
public static final Block QUARTZ_TATER = registerTaterBlock("quartz_tater", Blocks.QUARTZ_BLOCK, "7e7b4561d09d1a726fec3607706c9e3c77e8fc9b8c7e9c3637ca80ea0c86be21");
public static final Block REDSTONE_TATER = registerRedstoneTaterBlock("redstone_tater", new DustParticleEffect(DustParticleEffect.RED, 1), "c47dd2536f5a5eb2bdb1ea4389d3af8ca2fd9d5d2c97c660fc5bf4d970c974de");
public static final Block REDSTONE_TATER = registerRedstoneTaterBlock("redstone_tater", DustParticleEffect.RED, "c47dd2536f5a5eb2bdb1ea4389d3af8ca2fd9d5d2c97c660fc5bf4d970c974de");

public static final Block COPPER_TATER = registerTaterBlock("copper_tater", ParticleTypes.SCRAPE, "18207c7cf4007222691750b0783d6959261ddf72980483f7c9fcf96c2cba85b1");
public static final Block EXPOSED_COPPER_TATER = registerTaterBlock("exposed_copper_tater", ParticleTypes.SCRAPE, "bd5020090643edb5ec25d87cb1f408aad4f6018ec4bbe83d25a031ef1e705e4d");
Expand Down Expand Up @@ -427,7 +431,7 @@ public class NEBlocks {
public static final Block SILVER_CAPSULE_TATER = registerCapsuleTaterBlock("silver_capsule_tater", 0xBFBFBF, 9, "afdce3ea1399dd0b738faaecf89cc5bdcf179b8dc4f3d7964c8cd45c89257fd1");
public static final Block GOLD_CAPSULE_TATER = registerCapsuleTaterBlock("gold_capsule_tater", 0xF1A00E, 1, "db5388834578ccb906e97d3e54aeb33edcc12d821f081b7eb04830cbd260ad81");

public static final Block CORRUPTATER = register("corruptater", createTaterBlockSettings(), settings -> new CorruptaterBlock(settings, 2));
public static final Block CORRUPTATER = register("corruptater", createTaterBlockSettings(), settings -> new CorruptaterBlock(settings));

public static final BlockEntityType<LaunchPadBlockEntity> LAUNCH_PAD_ENTITY = FabricBlockEntityTypeBuilder.create(LaunchPadBlockEntity::new, GOLD_LAUNCH_PAD, IRON_LAUNCH_PAD).build();
public static final BlockEntityType<ContributorStatueBlockEntity> CONTRIBUTOR_STATUE_ENTITY = FabricBlockEntityTypeBuilder.create(ContributorStatueBlockEntity::new, CONTRIBUTOR_STATUE).build();
Expand All @@ -444,55 +448,65 @@ private static AbstractBlock.Settings createTaterBlockSettings() {
}

private static Block registerBotanicTaterBlock(String id, ParticleEffect effect, String textureUp, String textureDown) {
return register(id, createTaterBlockSettings(), settings -> new BotanicalPotatoBlock(settings, textureUp, textureDown, effect, 2));
return register(id, createTaterBlockSettings(), settings -> new BotanicalPotatoBlock(settings, new SimpleTaterParticleSpawner(effect), textureUp, textureDown));
}

private static Block registerTaterBlock(String id, TaterParticleSpawner particleSpawner, String texture) {
return register(id, createTaterBlockSettings(), settings -> new CubicPotatoBlock(settings, particleSpawner, texture));
}

private static Block registerTaterBlock(String id, ParticleEffect effect, String texture) {
return register(id, createTaterBlockSettings(), settings -> new CubicPotatoBlock(settings, effect, texture));
return registerTaterBlock(id, new SimpleTaterParticleSpawner(effect), texture);
}

private static Block registerTaterBlock(String id, Block particleBlock, String texture) {
return register(id, createTaterBlockSettings(), settings -> new CubicPotatoBlock(settings, particleBlock, texture));
var effect = new BlockStateParticleEffect(ParticleTypes.BLOCK, particleBlock.getDefaultState());
return registerTaterBlock(id, effect, texture);
}

private static Block registerTaterBlock(String id, Item particleItem, String texture) {
return register(id, createTaterBlockSettings(), settings -> new CubicPotatoBlock(settings, particleItem, texture));
var effect = new ItemStackParticleEffect(ParticleTypes.ITEM, new ItemStack(particleItem));
return registerTaterBlock(id, effect, texture);
}

private static Block registerTaterBlock(String id, ParticleEffect effect, String texture, int particleRate) {
return register(id, createTaterBlockSettings(), settings -> new CubicPotatoBlock(settings, effect, texture, particleRate));
return registerTaterBlock(id, new SimpleTaterParticleSpawner(effect, particleRate), texture);
}

private static Block registerColorPatternTaterBlock(String id, int[] pattern, String texture) {
return register(id, createTaterBlockSettings(), settings -> new ColorPatternTaterBlock(settings, pattern, texture));
return registerTaterBlock(id, new ColorPatternTaterParticleSpawner(pattern), texture);
}

private static Block registerEntityEffectTaterBlock(String id, String texture) {
return register(id, createTaterBlockSettings(), settings -> new EntityEffectTaterBlock(settings, texture));
return registerTaterBlock(id, EntityEffectTaterParticleSpawner.DEFAULT, texture);
}

private static Block registerLuckyTaterBlock(String id, String texture, String cooldownTexture) {
return register(id, createTaterBlockSettings(), settings -> new LuckyTaterBlock(settings, texture, cooldownTexture));
}

private static Block registerWardenTaterBlock(String id, String texture) {
return register(id, createTaterBlockSettings(), settings -> new WardenTaterBlock(settings, texture));
return registerTaterBlock(id, new WardenTaterParticleSpawner(), texture);
}

private static Block registerDiceTaterBlock(String id) {
return register(id, createTaterBlockSettings(), settings -> new DiceTaterBlock(settings));
}

private static Block registerTateroidBlock(String id, RegistryEntry<SoundEvent> defaultSound, double particleColor, String texture) {
return register(id, createTaterBlockSettings(), settings -> new TateroidBlock(settings, defaultSound, particleColor, texture));
private static Block registerTateroidBlock(String id, RegistryEntry<SoundEvent> defaultSound, double defaultParticleColor, String texture) {
return register(id, createTaterBlockSettings(), settings -> new TateroidBlock(settings, defaultSound, defaultParticleColor, texture));
}

private static Block registerColorTaterBlock(String id, int color, String texture) {
return registerTaterBlock(id, SimpleTaterParticleSpawner.ofDust(color), texture);
}

private static Block registerColorTaterBlock(String id, DyeColor color, String texture) {
return register(id, createTaterBlockSettings(), settings -> new ColorTaterBlock(settings, color, texture));
return registerTaterBlock(id, SimpleTaterParticleSpawner.ofDust(color), texture);
}

private static Block registerRedstoneTaterBlock(String id, ParticleEffect effect, String texture) {
return register(id, createTaterBlockSettings(), settings -> new RedstoneTaterBlock(settings, effect, texture));
private static Block registerRedstoneTaterBlock(String id, int color, String texture) {
return register(id, createTaterBlockSettings(), settings -> new RedstoneTaterBlock(settings, SimpleTaterParticleSpawner.ofDust(color), texture));
}

private static Block registerDaylightDetectorTaterBlock(String id, String texture, boolean inverted) {
Expand All @@ -508,22 +522,36 @@ private static Block registerBellTaterBlock(String id, String texture) {
}

private static Block registerElderGuardianParticleTaterBlock(String id, String texture) {
return register(id, createTaterBlockSettings(), settings -> new ElderGuardianParticleTater(settings, texture));
return registerTaterBlock(id, new SimpleTaterParticleSpawner(ParticleTypes.ELDER_GUARDIAN, 10000, 50), texture);
}

private static Block registerCapsuleTaterBlock(String id, int color, int weight, String texture) {
return register(id, createTaterBlockSettings(), settings -> new CapsuleTaterBlock(settings, color, weight, texture));
return register(id, createTaterBlockSettings(), settings -> new CapsuleTaterBlock(settings, RingTaterParticleSpawner.ofDust(color), weight, texture));
}

private static Block registerMarkerTaterBlock(String id, Block particleBlock, String texture) {
return register(id, createTaterBlockSettings(), settings -> new MarkerTaterBlock(settings, particleBlock, texture));
return registerTaterBlock(id, new SimpleMarkerTaterParticleSpawner(particleBlock, MarkerTaterParticleSpawner.MARKER_PLAYER_PARTICLE_RATE, SimpleMarkerTaterParticleSpawner.DEFAULT_BLOCK_PARTICLE_CHANCE), texture);
}

private static Block registerLightTaterBlock(String id, String texture) {
return register(id, createTaterBlockSettings(), settings -> new LightTaterBlock(settings, texture));
return registerTaterBlock(id, LightTaterParticleSpawner.DEFAULT, texture);
}

public static void register() {
TaterParticleSpawnerTypes.register();

registerBlockType("bell_tater", BellTaterBlock.CODEC);
registerBlockType("botantical_tater", BotanicalPotatoBlock.CODEC);
registerBlockType("capsule_tater", CapsuleTaterBlock.CODEC);
registerBlockType("corruptater", CorruptaterBlock.CODEC);
registerBlockType("cubic_tater", CubicPotatoBlock.CODEC);
registerBlockType("daylight_detector_tater", DaylightDetectorTaterBlock.CODEC);
registerBlockType("dice_tater", DiceTaterBlock.CODEC);
registerBlockType("lucky_tater", LuckyTaterBlock.CODEC);
registerBlockType("redstone_tater", RedstoneTaterBlock.CODEC);
registerBlockType("target_tater", TargetTaterBlock.CODEC);
registerBlockType("tateroid", TateroidBlock.CODEC);

registerBlockEntity("launch_pad", LAUNCH_PAD_ENTITY);
registerBlockEntity("contributor_statue", CONTRIBUTOR_STATUE_ENTITY);
registerBlockEntity("tateroid", TATEROID_ENTITY);
Expand All @@ -538,6 +566,10 @@ private static <T extends Block> T register(String id, Block.Settings settings,
return Registry.register(Registries.BLOCK, key, block);
}

private static <T extends Block> MapCodec<T> registerBlockType(String id, MapCodec<T> codec) {
return Registry.register(Registries.BLOCK_TYPE, NucleoidExtras.identifier(id), codec);
}

private static <T extends BlockEntity> BlockEntityType<T> registerBlockEntity(String id, BlockEntityType<T> type) {
Registry.register(Registries.BLOCK_ENTITY_TYPE, NucleoidExtras.identifier(id), type);
PolymerBlockUtils.registerBlockEntity(type);
Expand Down
27 changes: 25 additions & 2 deletions src/main/java/xyz/nucleoid/extras/lobby/block/tater/BellTaterBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,14 @@

import org.jetbrains.annotations.Nullable;
import xyz.nucleoid.extras.lobby.NEBlocks;
import xyz.nucleoid.extras.lobby.particle.SimpleTaterParticleSpawner;
import xyz.nucleoid.extras.lobby.particle.TaterParticleSpawner;
import xyz.nucleoid.extras.lobby.particle.TaterParticleSpawnerTypes;
import xyz.nucleoid.extras.mixin.BlockWithEntityAccessor;

import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import net.minecraft.block.Block;
import net.minecraft.block.BlockEntityProvider;
import net.minecraft.block.BlockState;
Expand Down Expand Up @@ -31,11 +37,23 @@
public class BellTaterBlock extends CubicPotatoBlock implements BlockEntityProvider {
public static final BooleanProperty POWERED = Properties.POWERED;

public BellTaterBlock(Settings settings, String texture) {
super(settings, ParticleTypes.NOTE, texture);
public static final MapCodec<BellTaterBlock> CODEC = RecordCodecBuilder.mapCodec(instance ->
instance.group(
createSettingsCodec(),
TaterParticleSpawnerTypes.CODEC.fieldOf("particle_spawner").forGetter(BellTaterBlock::getParticleSpawner),
Codec.STRING.fieldOf("texture").forGetter(BellTaterBlock::getItemTexture)
).apply(instance, BellTaterBlock::new)
);

public BellTaterBlock(Settings settings, TaterParticleSpawner particleSpawner, String texture) {
super(settings, particleSpawner, texture);
this.setDefaultState(this.stateManager.getDefaultState().with(POWERED, false));
}

public BellTaterBlock(Settings settings, String texture) {
this(settings, new SimpleTaterParticleSpawner(ParticleTypes.NOTE), texture);
}

@Override
public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sourceBlock, WireOrientation wireOrientation, boolean notify) {
boolean bl = world.isReceivingRedstonePower(pos);
Expand Down Expand Up @@ -101,6 +119,11 @@ public BlockEntity createBlockEntity(BlockPos pos, BlockState state) {
return new BellTaterBlockEntity(pos, state);
}

@Override
public MapCodec<? extends BellTaterBlock> getCodec() {
return CODEC;
}

@Override
@Nullable
public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type) {
Expand Down
29 changes: 26 additions & 3 deletions src/main/java/xyz/nucleoid/extras/lobby/block/tater/BotanicalPotatoBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
package xyz.nucleoid.extras.lobby.block.tater;

import com.mojang.serialization.Codec;
import com.mojang.serialization.MapCodec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import eu.pb4.polymer.core.api.utils.PolymerUtils;
import eu.pb4.polymer.virtualentity.api.BlockWithElementHolder;
import eu.pb4.polymer.virtualentity.api.ElementHolder;
Expand All @@ -13,7 +16,6 @@
import net.minecraft.item.ItemPlacementContext;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ModelTransformationMode;
import net.minecraft.particle.ParticleEffect;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.state.StateManager;
import net.minecraft.state.property.Properties;
Expand All @@ -26,15 +28,31 @@
import net.minecraft.world.World;
import org.joml.Matrix4f;
import org.joml.Vector3f;
import xyz.nucleoid.extras.lobby.particle.TaterParticleSpawner;
import xyz.nucleoid.extras.lobby.particle.TaterParticleSpawnerTypes;
import xyz.nucleoid.extras.util.SkinEncoder;
import xyz.nucleoid.packettweaker.PacketContext;

public class BotanicalPotatoBlock extends TinyPotatoBlock implements BlockWithElementHolder {
public static final MapCodec<BotanicalPotatoBlock> CODEC = RecordCodecBuilder.mapCodec(instance ->
instance.group(
createSettingsCodec(),
TaterParticleSpawnerTypes.CODEC.fieldOf("particle_spawner").forGetter(BotanicalPotatoBlock::getParticleSpawner),
Codec.STRING.fieldOf("upper_texture").forGetter(BotanicalPotatoBlock::getItemTexture),
Codec.STRING.fieldOf("lower_texture").forGetter(b -> b.lowerTexture)
).apply(instance, BotanicalPotatoBlock::new)
);

private final String lowerTexture;

private final ItemStack upStack;
private final ItemStack downStack;

public BotanicalPotatoBlock(Settings settings, String upperTexture, String lowerTexture, ParticleEffect particleEffect, int particleRate) {
super(settings.nonOpaque(), upperTexture, particleEffect, particleRate);
public BotanicalPotatoBlock(Settings settings, TaterParticleSpawner particleSpawner, String upperTexture, String lowerTexture) {
super(settings.nonOpaque(), particleSpawner, upperTexture);

this.lowerTexture = lowerTexture;

this.upStack = PolymerUtils.createPlayerHead(this.getItemTexture());
this.downStack = PolymerUtils.createPlayerHead(SkinEncoder.encode(lowerTexture));
}
Expand Down Expand Up @@ -75,6 +93,11 @@ public ActionResult onUse(BlockState state, World world, BlockPos pos, PlayerEnt
return super.onUse(state, world, pos, player, hit);
}

@Override
public MapCodec<? extends BotanicalPotatoBlock> getCodec() {
return CODEC;
}

private class Model extends ElementHolder {
private final ItemDisplayElement upPart;
private final ItemDisplayElement downPart;
Expand Down
Loading
Loading