removed = Lists.newArrayList();
-
- for (TrackingEmitter emitter : this.trackingEmitters) {
- emitter.tick();
- if (!emitter.isAlive()) {
- removed.add(emitter);
- }
- }
-
- this.trackingEmitters.removeAll(removed);
- }
-
- Particle particle;
- if (!this.particlesToAdd.isEmpty()) {
- while ((particle = this.particlesToAdd.poll()) != null) {
- this.particles.computeIfAbsent(particle.getGroup(), this::createParticleGroup).add(particle);
- }
- }
- }
-
- private ParticleGroup createParticleGroup(ParticleRenderType type) {
- if (type == ParticleRenderType.ITEM_PICKUP) {
- return new ItemPickupParticleGroup(this);
- } else if (type == ParticleRenderType.ELDER_GUARDIANS) {
- return new ElderGuardianParticleGroup(this);
- } else if (this.particleGroupFactories.containsKey(type)) {
- return this.particleGroupFactories.get(type).apply(this);
- } else {
- return (ParticleGroup)(type == ParticleRenderType.NO_RENDER ? new NoRenderParticleGroup(this) : new QuadParticleGroup(this, type));
- }
- }
-
- protected void updateCount(ParticleLimit limit, int change) {
- this.trackedParticleCounts.addTo(limit, change);
- }
-
- public void extract(ParticlesRenderState particlesRenderState, Frustum frustum, Camera camera, float partialTickTime) {
- for (ParticleRenderType particleType : this.particleRenderOrder) {
- ParticleGroup particles = this.particles.get(particleType);
- if (particles != null && !particles.isEmpty()) {
- particlesRenderState.add(particles.extractRenderState(frustum, camera, partialTickTime));
- }
- }
- }
-
- public void setLevel(@Nullable ClientLevel level) {
- this.level = level;
- this.clearParticles();
- this.trackingEmitters.clear();
- }
-
- public String countParticles() {
- return String.valueOf(this.particles.values().stream().mapToInt(ParticleGroup::size).sum());
- }
-
- private boolean hasSpaceInParticleLimit(ParticleLimit limit) {
- return this.trackedParticleCounts.getInt(limit) < limit.limit();
- }
-
- public void clearParticles() {
- this.particles.clear();
- this.particlesToAdd.clear();
- this.trackingEmitters.clear();
- this.trackedParticleCounts.clear();
- }
-}
diff --git a/net/minecraft/client/particle/ParticleGroup.java b/net/minecraft/client/particle/ParticleGroup.java
deleted file mode 100644
index 24567071..00000000
--- a/net/minecraft/client/particle/ParticleGroup.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package net.minecraft.client.particle;
-
-import com.google.common.collect.EvictingQueue;
-import java.util.Iterator;
-import java.util.Queue;
-import net.minecraft.CrashReport;
-import net.minecraft.CrashReportCategory;
-import net.minecraft.ReportedException;
-import net.minecraft.client.Camera;
-import net.minecraft.client.renderer.culling.Frustum;
-import net.minecraft.client.renderer.state.level.ParticleGroupRenderState;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
-
-@OnlyIn(Dist.CLIENT)
-public abstract class ParticleGroup {
- private static final int MAX_PARTICLES = 16384;
- protected final ParticleEngine engine;
- protected final Queue
particles = EvictingQueue.create(16384);
-
- public ParticleGroup(ParticleEngine engine) {
- this.engine = engine;
- }
-
- public boolean isEmpty() {
- return this.particles.isEmpty();
- }
-
- public void tickParticles() {
- if (!this.particles.isEmpty()) {
- Iterator
iterator = this.particles.iterator();
-
- while (iterator.hasNext()) {
- P particle = iterator.next();
- this.tickParticle(particle);
- if (!particle.isAlive()) {
- particle.getParticleLimit().ifPresent(options -> this.engine.updateCount(options, -1));
- iterator.remove();
- }
- }
- }
- }
-
- private void tickParticle(Particle particle) {
- try {
- particle.tick();
- } catch (Throwable var5) {
- CrashReport report = CrashReport.forThrowable(var5, "Ticking Particle");
- CrashReportCategory category = report.addCategory("Particle being ticked");
- category.setDetail("Particle", particle::toString);
- category.setDetail("Particle Type", particle.getGroup()::toString);
- throw new ReportedException(report);
- }
- }
-
- public void add(Particle particle) {
- this.particles.add((P)particle);
- }
-
- public int size() {
- return this.particles.size();
- }
-
- public abstract ParticleGroupRenderState extractRenderState(Frustum frustum, Camera camera, float partialTickTime);
-
- public Queue
getAll() {
- return this.particles;
- }
-}
diff --git a/net/minecraft/client/particle/ParticleResources.java b/net/minecraft/client/particle/ParticleResources.java
deleted file mode 100644
index 240114fc..00000000
--- a/net/minecraft/client/particle/ParticleResources.java
+++ /dev/null
@@ -1,318 +0,0 @@
-package net.minecraft.client.particle;
-
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
-import com.mojang.logging.LogUtils;
-import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
-import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
-import java.io.IOException;
-import java.io.Reader;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.Executor;
-import java.util.stream.Collectors;
-import net.minecraft.client.renderer.texture.SpriteLoader;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.resources.model.sprite.AtlasManager;
-import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.core.particles.ParticleType;
-import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.data.AtlasIds;
-import net.minecraft.resources.FileToIdConverter;
-import net.minecraft.resources.Identifier;
-import net.minecraft.server.packs.resources.PreparableReloadListener;
-import net.minecraft.server.packs.resources.Resource;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.util.GsonHelper;
-import net.minecraft.util.RandomSource;
-import net.minecraft.util.Util;
-import net.minecraft.util.profiling.Profiler;
-import net.minecraft.util.profiling.ProfilerFiller;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
-import org.jspecify.annotations.Nullable;
-import org.slf4j.Logger;
-
-@OnlyIn(Dist.CLIENT)
-public class ParticleResources implements PreparableReloadListener {
- private static final Logger LOGGER = LogUtils.getLogger();
- private static final FileToIdConverter PARTICLE_LISTER = FileToIdConverter.json("particles");
- private final Map spriteSets = Maps.newHashMap();
- private final Map> providers = new java.util.HashMap<>();
- private @Nullable Runnable onReload;
-
- public ParticleResources() {
- this.registerProviders();
- }
-
- public void onReload(Runnable onReload) {
- this.onReload = onReload;
- }
-
- private void registerProviders() {
- this.register(ParticleTypes.ANGRY_VILLAGER, HeartParticle.AngryVillagerProvider::new);
- this.register(ParticleTypes.BLOCK_MARKER, new BlockMarker.Provider());
- this.register(ParticleTypes.BLOCK, new TerrainParticle.Provider());
- this.register(ParticleTypes.BUBBLE, BubbleParticle.Provider::new);
- this.register(ParticleTypes.BUBBLE_COLUMN_UP, BubbleColumnUpParticle.Provider::new);
- this.register(ParticleTypes.BUBBLE_POP, BubblePopParticle.Provider::new);
- this.register(ParticleTypes.CAMPFIRE_COSY_SMOKE, CampfireSmokeParticle.CosyProvider::new);
- this.register(ParticleTypes.CAMPFIRE_SIGNAL_SMOKE, CampfireSmokeParticle.SignalProvider::new);
- this.register(ParticleTypes.CLOUD, PlayerCloudParticle.Provider::new);
- this.register(ParticleTypes.COMPOSTER, SuspendedTownParticle.ComposterFillProvider::new);
- this.register(ParticleTypes.COPPER_FIRE_FLAME, FlameParticle.Provider::new);
- this.register(ParticleTypes.CRIT, CritParticle.Provider::new);
- this.register(ParticleTypes.CURRENT_DOWN, WaterCurrentDownParticle.Provider::new);
- this.register(ParticleTypes.DAMAGE_INDICATOR, CritParticle.DamageIndicatorProvider::new);
- this.register(ParticleTypes.DRAGON_BREATH, DragonBreathParticle.Provider::new);
- this.register(ParticleTypes.DOLPHIN, SuspendedTownParticle.DolphinSpeedProvider::new);
- this.register(ParticleTypes.DRIPPING_LAVA, DripParticle.LavaHangProvider::new);
- this.register(ParticleTypes.FALLING_LAVA, DripParticle.LavaFallProvider::new);
- this.register(ParticleTypes.LANDING_LAVA, DripParticle.LavaLandProvider::new);
- this.register(ParticleTypes.DRIPPING_WATER, DripParticle.WaterHangProvider::new);
- this.register(ParticleTypes.FALLING_WATER, DripParticle.WaterFallProvider::new);
- this.register(ParticleTypes.DUST, DustParticle.Provider::new);
- this.register(ParticleTypes.DUST_COLOR_TRANSITION, DustColorTransitionParticle.Provider::new);
- this.register(ParticleTypes.EFFECT, SpellParticle.InstantProvider::new);
- this.register(ParticleTypes.ELDER_GUARDIAN, new ElderGuardianParticle.Provider());
- this.register(ParticleTypes.ENCHANTED_HIT, CritParticle.MagicProvider::new);
- this.register(ParticleTypes.ENCHANT, FlyTowardsPositionParticle.EnchantProvider::new);
- this.register(ParticleTypes.END_ROD, EndRodParticle.Provider::new);
- this.register(ParticleTypes.ENTITY_EFFECT, SpellParticle.MobEffectProvider::new);
- this.register(ParticleTypes.EXPLOSION_EMITTER, new HugeExplosionSeedParticle.Provider());
- this.register(ParticleTypes.EXPLOSION, HugeExplosionParticle.Provider::new);
- this.register(ParticleTypes.SONIC_BOOM, SonicBoomParticle.Provider::new);
- this.register(ParticleTypes.FALLING_DUST, FallingDustParticle.Provider::new);
- this.register(ParticleTypes.GUST, GustParticle.Provider::new);
- this.register(ParticleTypes.SMALL_GUST, GustParticle.SmallProvider::new);
- this.register(ParticleTypes.GUST_EMITTER_LARGE, new GustSeedParticle.Provider(3.0, 7, 0));
- this.register(ParticleTypes.GUST_EMITTER_SMALL, new GustSeedParticle.Provider(1.0, 3, 2));
- this.register(ParticleTypes.FIREWORK, FireworkParticles.SparkProvider::new);
- this.register(ParticleTypes.FISHING, WakeParticle.Provider::new);
- this.register(ParticleTypes.FLAME, FlameParticle.Provider::new);
- this.register(ParticleTypes.INFESTED, SpellParticle.Provider::new);
- this.register(ParticleTypes.SCULK_SOUL, SoulParticle.EmissiveProvider::new);
- this.register(ParticleTypes.SCULK_CHARGE, SculkChargeParticle.Provider::new);
- this.register(ParticleTypes.SCULK_CHARGE_POP, SculkChargePopParticle.Provider::new);
- this.register(ParticleTypes.SOUL, SoulParticle.Provider::new);
- this.register(ParticleTypes.SOUL_FIRE_FLAME, FlameParticle.Provider::new);
- this.register(ParticleTypes.FLASH, FireworkParticles.FlashProvider::new);
- this.register(ParticleTypes.HAPPY_VILLAGER, SuspendedTownParticle.HappyVillagerProvider::new);
- this.register(ParticleTypes.HEART, HeartParticle.Provider::new);
- this.register(ParticleTypes.INSTANT_EFFECT, SpellParticle.InstantProvider::new);
- this.register(ParticleTypes.ITEM, new BreakingItemParticle.Provider());
- this.register(ParticleTypes.ITEM_SLIME, new BreakingItemParticle.SlimeProvider());
- this.register(ParticleTypes.ITEM_COBWEB, new BreakingItemParticle.CobwebProvider());
- this.register(ParticleTypes.ITEM_SNOWBALL, new BreakingItemParticle.SnowballProvider());
- this.register(ParticleTypes.LARGE_SMOKE, LargeSmokeParticle.Provider::new);
- this.register(ParticleTypes.LAVA, LavaParticle.Provider::new);
- this.register(ParticleTypes.MYCELIUM, SuspendedTownParticle.Provider::new);
- this.register(ParticleTypes.NAUTILUS, FlyTowardsPositionParticle.NautilusProvider::new);
- this.register(ParticleTypes.NOTE, NoteParticle.Provider::new);
- this.register(ParticleTypes.POOF, ExplodeParticle.Provider::new);
- this.register(ParticleTypes.PORTAL, PortalParticle.Provider::new);
- this.register(ParticleTypes.RAIN, WaterDropParticle.Provider::new);
- this.register(ParticleTypes.SMOKE, SmokeParticle.Provider::new);
- this.register(ParticleTypes.WHITE_SMOKE, WhiteSmokeParticle.Provider::new);
- this.register(ParticleTypes.SNEEZE, PlayerCloudParticle.SneezeProvider::new);
- this.register(ParticleTypes.SNOWFLAKE, SnowflakeParticle.Provider::new);
- this.register(ParticleTypes.SPIT, SpitParticle.Provider::new);
- this.register(ParticleTypes.SWEEP_ATTACK, AttackSweepParticle.Provider::new);
- this.register(ParticleTypes.TOTEM_OF_UNDYING, TotemParticle.Provider::new);
- this.register(ParticleTypes.SQUID_INK, SquidInkParticle.Provider::new);
- this.register(ParticleTypes.UNDERWATER, SuspendedParticle.UnderwaterProvider::new);
- this.register(ParticleTypes.SPLASH, SplashParticle.Provider::new);
- this.register(ParticleTypes.WITCH, SpellParticle.WitchProvider::new);
- this.register(ParticleTypes.DRIPPING_HONEY, DripParticle.HoneyHangProvider::new);
- this.register(ParticleTypes.FALLING_HONEY, DripParticle.HoneyFallProvider::new);
- this.register(ParticleTypes.LANDING_HONEY, DripParticle.HoneyLandProvider::new);
- this.register(ParticleTypes.FALLING_NECTAR, DripParticle.NectarFallProvider::new);
- this.register(ParticleTypes.FALLING_SPORE_BLOSSOM, DripParticle.SporeBlossomFallProvider::new);
- this.register(ParticleTypes.SPORE_BLOSSOM_AIR, SuspendedParticle.SporeBlossomAirProvider::new);
- this.register(ParticleTypes.ASH, AshParticle.Provider::new);
- this.register(ParticleTypes.CRIMSON_SPORE, SuspendedParticle.CrimsonSporeProvider::new);
- this.register(ParticleTypes.WARPED_SPORE, SuspendedParticle.WarpedSporeProvider::new);
- this.register(ParticleTypes.DRIPPING_OBSIDIAN_TEAR, DripParticle.ObsidianTearHangProvider::new);
- this.register(ParticleTypes.FALLING_OBSIDIAN_TEAR, DripParticle.ObsidianTearFallProvider::new);
- this.register(ParticleTypes.LANDING_OBSIDIAN_TEAR, DripParticle.ObsidianTearLandProvider::new);
- this.register(ParticleTypes.REVERSE_PORTAL, ReversePortalParticle.ReversePortalProvider::new);
- this.register(ParticleTypes.WHITE_ASH, WhiteAshParticle.Provider::new);
- this.register(ParticleTypes.SMALL_FLAME, FlameParticle.SmallFlameProvider::new);
- this.register(ParticleTypes.DRIPPING_DRIPSTONE_WATER, DripParticle.DripstoneWaterHangProvider::new);
- this.register(ParticleTypes.FALLING_DRIPSTONE_WATER, DripParticle.DripstoneWaterFallProvider::new);
- this.register(ParticleTypes.CHERRY_LEAVES, FallingLeavesParticle.CherryProvider::new);
- this.register(ParticleTypes.PALE_OAK_LEAVES, FallingLeavesParticle.PaleOakProvider::new);
- this.register(ParticleTypes.TINTED_LEAVES, FallingLeavesParticle.TintedLeavesProvider::new);
- this.register(ParticleTypes.DRIPPING_DRIPSTONE_LAVA, DripParticle.DripstoneLavaHangProvider::new);
- this.register(ParticleTypes.FALLING_DRIPSTONE_LAVA, DripParticle.DripstoneLavaFallProvider::new);
- this.register(ParticleTypes.VIBRATION, VibrationSignalParticle.Provider::new);
- this.register(ParticleTypes.TRAIL, TrailParticle.Provider::new);
- this.register(ParticleTypes.PAUSE_MOB_GROWTH, SimpleVerticalParticle.PauseMobGrowthProvider::new);
- this.register(ParticleTypes.RESET_MOB_GROWTH, SimpleVerticalParticle.ResetMobGrowthProvider::new);
- this.register(ParticleTypes.GLOW_SQUID_INK, SquidInkParticle.GlowInkProvider::new);
- this.register(ParticleTypes.GLOW, GlowParticle.GlowSquidProvider::new);
- this.register(ParticleTypes.WAX_ON, GlowParticle.WaxOnProvider::new);
- this.register(ParticleTypes.WAX_OFF, GlowParticle.WaxOffProvider::new);
- this.register(ParticleTypes.ELECTRIC_SPARK, GlowParticle.ElectricSparkProvider::new);
- this.register(ParticleTypes.SCRAPE, GlowParticle.ScrapeProvider::new);
- this.register(ParticleTypes.SHRIEK, ShriekParticle.Provider::new);
- this.register(ParticleTypes.EGG_CRACK, SuspendedTownParticle.EggCrackProvider::new);
- this.register(ParticleTypes.DUST_PLUME, DustPlumeParticle.Provider::new);
- this.register(ParticleTypes.TRIAL_SPAWNER_DETECTED_PLAYER, TrialSpawnerDetectionParticle.Provider::new);
- this.register(ParticleTypes.TRIAL_SPAWNER_DETECTED_PLAYER_OMINOUS, TrialSpawnerDetectionParticle.Provider::new);
- this.register(ParticleTypes.VAULT_CONNECTION, FlyTowardsPositionParticle.VaultConnectionProvider::new);
- this.register(ParticleTypes.DUST_PILLAR, new TerrainParticle.DustPillarProvider());
- this.register(ParticleTypes.RAID_OMEN, SpellParticle.Provider::new);
- this.register(ParticleTypes.TRIAL_OMEN, SpellParticle.Provider::new);
- this.register(ParticleTypes.OMINOUS_SPAWNING, FlyStraightTowardsParticle.OminousSpawnProvider::new);
- this.register(ParticleTypes.BLOCK_CRUMBLE, new TerrainParticle.CrumblingProvider());
- this.register(ParticleTypes.FIREFLY, FireflyParticle.FireflyProvider::new);
- }
-
- /** @deprecated Register via {@link net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent} */
- @Deprecated
- public void register(ParticleType type, ParticleProvider provider) {
- this.providers.put(BuiltInRegistries.PARTICLE_TYPE.getKey(type), provider);
- }
-
- /** @deprecated Register via {@link net.neoforged.neoforge.client.event.RegisterParticleProvidersEvent} */
- @Deprecated
- public void register(ParticleType type, ParticleResources.SpriteParticleRegistration provider) {
- ParticleResources.MutableSpriteSet spriteSet = new ParticleResources.MutableSpriteSet();
- this.spriteSets.put(BuiltInRegistries.PARTICLE_TYPE.getKey(type), spriteSet);
- this.providers.put(BuiltInRegistries.PARTICLE_TYPE.getKey(type), provider.create(spriteSet));
- }
-
- @Override
- public CompletableFuture reload(
- PreparableReloadListener.SharedState currentReload,
- Executor taskExecutor,
- PreparableReloadListener.PreparationBarrier preparationBarrier,
- Executor reloadExecutor
- ) {
- ResourceManager manager = currentReload.resourceManager();
-
- @OnlyIn(Dist.CLIENT)
- record ParticleDefinition(Identifier id, Optional> sprites) {
- }
-
- CompletableFuture> spriteSetsToLoad = CompletableFuture.>supplyAsync(
- () -> PARTICLE_LISTER.listMatchingResources(manager), taskExecutor
- )
- .thenCompose(
- definitionsToScan -> {
- List> loadTasks = new ArrayList<>(definitionsToScan.size());
- definitionsToScan.forEach(
- (resourceId, resource) -> {
- Identifier particleId = PARTICLE_LISTER.fileToId(resourceId);
- loadTasks.add(
- CompletableFuture.supplyAsync(
- () -> new ParticleDefinition(particleId, this.loadParticleDescription(particleId, resource)), taskExecutor
- )
- );
- }
- );
- return Util.sequence(loadTasks);
- }
- );
- CompletableFuture pendingSprites = currentReload.get(AtlasManager.PENDING_STITCH).get(AtlasIds.PARTICLES);
- return CompletableFuture.allOf(spriteSetsToLoad, pendingSprites).thenCompose(preparationBarrier::wait).thenAcceptAsync(unused -> {
- if (this.onReload != null) {
- this.onReload.run();
- }
-
- ProfilerFiller reloadProfiler = Profiler.get();
- reloadProfiler.push("upload");
- SpriteLoader.Preparations sprites = pendingSprites.join();
- reloadProfiler.popPush("bindSpriteSets");
- Set missingSprites = new HashSet<>();
- TextureAtlasSprite missingSprite = sprites.missing();
- spriteSetsToLoad.join().forEach(p -> {
- Optional> spriteIds = p.sprites();
- if (!spriteIds.isEmpty()) {
- List contents = new ArrayList<>();
-
- for (Identifier spriteId : spriteIds.get()) {
- TextureAtlasSprite sprite = sprites.getSprite(spriteId);
- if (sprite == null) {
- missingSprites.add(spriteId);
- contents.add(missingSprite);
- } else {
- contents.add(sprite);
- }
- }
-
- if (contents.isEmpty()) {
- contents.add(missingSprite);
- }
-
- this.spriteSets.get(p.id()).rebind(contents);
- }
- });
- if (!missingSprites.isEmpty()) {
- LOGGER.warn("Missing particle sprites: {}", missingSprites.stream().sorted().map(Identifier::toString).collect(Collectors.joining(",")));
- }
-
- reloadProfiler.pop();
- }, reloadExecutor);
- }
-
- private Optional> loadParticleDescription(Identifier id, Resource resource) {
- if (!this.spriteSets.containsKey(id)) {
- LOGGER.debug("Redundant texture list for particle: {}", id);
- return Optional.empty();
- } else {
- try {
- Optional var5;
- try (Reader reader = resource.openAsReader()) {
- ParticleDescription description = ParticleDescription.fromJson(GsonHelper.parse(reader));
- var5 = Optional.of(description.getTextures());
- }
-
- return var5;
- } catch (IOException var8) {
- throw new IllegalStateException("Failed to load description for particle " + id, var8);
- }
- }
- }
-
- public Map> getProviders() {
- return this.providers;
- }
-
- @OnlyIn(Dist.CLIENT)
- private static class MutableSpriteSet implements SpriteSet {
- private List sprites;
-
- @Override
- public TextureAtlasSprite get(int index, int max) {
- return this.sprites.get(index * (this.sprites.size() - 1) / max);
- }
-
- @Override
- public TextureAtlasSprite get(RandomSource random) {
- return this.sprites.get(random.nextInt(this.sprites.size()));
- }
-
- @Override
- public TextureAtlasSprite first() {
- return this.sprites.getFirst();
- }
-
- public void rebind(List ids) {
- this.sprites = ImmutableList.copyOf(ids);
- }
- }
-
- @FunctionalInterface
- @OnlyIn(Dist.CLIENT)
- public interface SpriteParticleRegistration {
- ParticleProvider create(SpriteSet spriteSet);
- }
-}
diff --git a/net/minecraft/client/particle/QuadParticleGroup.java b/net/minecraft/client/particle/QuadParticleGroup.java
deleted file mode 100644
index 6e48c7f1..00000000
--- a/net/minecraft/client/particle/QuadParticleGroup.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package net.minecraft.client.particle;
-
-import net.minecraft.CrashReport;
-import net.minecraft.CrashReportCategory;
-import net.minecraft.ReportedException;
-import net.minecraft.client.Camera;
-import net.minecraft.client.renderer.culling.Frustum;
-import net.minecraft.client.renderer.state.level.ParticleGroupRenderState;
-import net.minecraft.client.renderer.state.level.QuadParticleRenderState;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
-
-@OnlyIn(Dist.CLIENT)
-public class QuadParticleGroup extends ParticleGroup {
- private final ParticleRenderType particleType;
- final QuadParticleRenderState particleTypeRenderState = new QuadParticleRenderState();
-
- public QuadParticleGroup(ParticleEngine engine, ParticleRenderType particleType) {
- super(engine);
- this.particleType = particleType;
- }
-
- @Override
- public ParticleGroupRenderState extractRenderState(Frustum frustum, Camera camera, float partialTickTime) {
- for (SingleQuadParticle particle : this.particles) {
- if (frustum.pointInFrustum(particle.x, particle.y, particle.z)) {
- try {
- particle.extract(this.particleTypeRenderState, camera, partialTickTime);
- } catch (Throwable var9) {
- CrashReport report = CrashReport.forThrowable(var9, "Rendering Particle");
- CrashReportCategory category = report.addCategory("Particle being rendered");
- category.setDetail("Particle", particle::toString);
- category.setDetail("Particle Type", this.particleType::toString);
- throw new ReportedException(report);
- }
- }
- }
-
- return this.particleTypeRenderState;
- }
-}
diff --git a/net/minecraft/client/particle/SingleQuadParticle.java b/net/minecraft/client/particle/SingleQuadParticle.java
deleted file mode 100644
index 91f3db5c..00000000
--- a/net/minecraft/client/particle/SingleQuadParticle.java
+++ /dev/null
@@ -1,197 +0,0 @@
-package net.minecraft.client.particle;
-
-import com.mojang.blaze3d.pipeline.RenderPipeline;
-import net.minecraft.client.Camera;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.client.renderer.RenderPipelines;
-import net.minecraft.client.renderer.state.level.QuadParticleRenderState;
-import net.minecraft.client.renderer.texture.TextureAtlas;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.resources.Identifier;
-import net.minecraft.util.ARGB;
-import net.minecraft.util.Mth;
-import net.minecraft.world.phys.Vec3;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
-import org.joml.Quaternionf;
-
-@OnlyIn(Dist.CLIENT)
-public abstract class SingleQuadParticle extends Particle {
- protected float quadSize;
- protected float rCol = 1.0F;
- protected float gCol = 1.0F;
- protected float bCol = 1.0F;
- protected float alpha = 1.0F;
- protected float roll;
- protected float oRoll;
- protected TextureAtlasSprite sprite;
-
- public SingleQuadParticle(ClientLevel level, double x, double y, double z, TextureAtlasSprite sprite) {
- super(level, x, y, z);
- this.sprite = sprite;
- this.quadSize = 0.1F * (this.random.nextFloat() * 0.5F + 0.5F) * 2.0F;
- }
-
- public SingleQuadParticle(ClientLevel level, double x, double y, double z, double xa, double ya, double za, TextureAtlasSprite sprite) {
- super(level, x, y, z, xa, ya, za);
- this.sprite = sprite;
- this.quadSize = 0.1F * (this.random.nextFloat() * 0.5F + 0.5F) * 2.0F;
- }
-
- public SingleQuadParticle.FacingCameraMode getFacingCameraMode() {
- return SingleQuadParticle.FacingCameraMode.LOOKAT_XYZ;
- }
-
- public void extract(QuadParticleRenderState particleTypeRenderState, Camera camera, float partialTickTime) {
- Quaternionf rotation = new Quaternionf();
- this.getFacingCameraMode().setRotation(rotation, camera, partialTickTime);
- if (this.roll != 0.0F) {
- rotation.rotateZ(Mth.lerp(partialTickTime, this.oRoll, this.roll));
- }
-
- this.extractRotatedQuad(particleTypeRenderState, camera, rotation, partialTickTime);
- }
-
- protected void extractRotatedQuad(QuadParticleRenderState particleTypeRenderState, Camera camera, Quaternionf rotation, float partialTickTime) {
- Vec3 pos = camera.position();
- float x = (float)(Mth.lerp((double)partialTickTime, this.xo, this.x) - pos.x());
- float y = (float)(Mth.lerp((double)partialTickTime, this.yo, this.y) - pos.y());
- float z = (float)(Mth.lerp((double)partialTickTime, this.zo, this.z) - pos.z());
- this.extractRotatedQuad(particleTypeRenderState, rotation, x, y, z, partialTickTime);
- }
-
- protected void extractRotatedQuad(QuadParticleRenderState particleTypeRenderState, Quaternionf rotation, float x, float y, float z, float partialTickTime) {
- particleTypeRenderState.add(
- this.getLayer(),
- x,
- y,
- z,
- rotation.x,
- rotation.y,
- rotation.z,
- rotation.w,
- this.getQuadSize(partialTickTime),
- this.getU0(),
- this.getU1(),
- this.getV0(),
- this.getV1(),
- ARGB.colorFromFloat(this.alpha, this.rCol, this.gCol, this.bCol),
- this.getLightCoords(partialTickTime)
- );
- }
-
- public float getQuadSize(float a) {
- return this.quadSize;
- }
-
- @Override
- public Particle scale(float scale) {
- this.quadSize *= scale;
- return super.scale(scale);
- }
-
- @Override
- public ParticleRenderType getGroup() {
- return ParticleRenderType.SINGLE_QUADS;
- }
-
- public void setSpriteFromAge(SpriteSet sprites) {
- if (!this.removed) {
- this.setSprite(sprites.get(this.age, this.lifetime));
- }
- }
-
- protected void setSprite(TextureAtlasSprite icon) {
- this.sprite = icon;
- }
-
- protected float getU0() {
- return this.sprite.getU0();
- }
-
- protected float getU1() {
- return this.sprite.getU1();
- }
-
- protected float getV0() {
- return this.sprite.getV0();
- }
-
- protected float getV1() {
- return this.sprite.getV1();
- }
-
- protected abstract SingleQuadParticle.Layer getLayer();
-
- public void setColor(float r, float g, float b) {
- this.rCol = r;
- this.gCol = g;
- this.bCol = b;
- }
-
- protected void setAlpha(float alpha) {
- this.alpha = alpha;
- }
-
- @Override
- public String toString() {
- return this.getClass().getSimpleName()
- + ", Pos ("
- + this.x
- + ","
- + this.y
- + ","
- + this.z
- + "), RGBA ("
- + this.rCol
- + ","
- + this.gCol
- + ","
- + this.bCol
- + ","
- + this.alpha
- + "), Age "
- + this.age;
- }
-
- @OnlyIn(Dist.CLIENT)
- public interface FacingCameraMode {
- SingleQuadParticle.FacingCameraMode LOOKAT_XYZ = (target, camera, partialTickTime) -> target.set(camera.rotation());
- SingleQuadParticle.FacingCameraMode LOOKAT_Y = (target, camera, partialTickTime) -> target.set(0.0F, camera.rotation().y, 0.0F, camera.rotation().w);
-
- void setRotation(final Quaternionf target, final Camera camera, final float partialTickTime);
- }
-
- @OnlyIn(Dist.CLIENT)
- public record Layer(boolean translucent, Identifier textureAtlasLocation, RenderPipeline pipeline) {
- public static final SingleQuadParticle.Layer OPAQUE_TERRAIN = new SingleQuadParticle.Layer(
- false, TextureAtlas.LOCATION_BLOCKS, RenderPipelines.OPAQUE_PARTICLE
- );
- public static final SingleQuadParticle.Layer TRANSLUCENT_TERRAIN = new SingleQuadParticle.Layer(
- true, TextureAtlas.LOCATION_BLOCKS, RenderPipelines.TRANSLUCENT_PARTICLE
- );
- public static final SingleQuadParticle.Layer OPAQUE_ITEMS = new SingleQuadParticle.Layer(
- false, TextureAtlas.LOCATION_ITEMS, RenderPipelines.OPAQUE_PARTICLE
- );
- public static final SingleQuadParticle.Layer TRANSLUCENT_ITEMS = new SingleQuadParticle.Layer(
- true, TextureAtlas.LOCATION_ITEMS, RenderPipelines.TRANSLUCENT_PARTICLE
- );
- public static final SingleQuadParticle.Layer OPAQUE = new SingleQuadParticle.Layer(
- false, TextureAtlas.LOCATION_PARTICLES, RenderPipelines.OPAQUE_PARTICLE
- );
- public static final SingleQuadParticle.Layer TRANSLUCENT = new SingleQuadParticle.Layer(
- true, TextureAtlas.LOCATION_PARTICLES, RenderPipelines.TRANSLUCENT_PARTICLE
- );
-
- public static SingleQuadParticle.Layer bySprite(TextureAtlasSprite sprite) {
- boolean translucent = sprite.transparency().hasTranslucent();
- if (sprite.atlasLocation().equals(TextureAtlas.LOCATION_BLOCKS)) {
- return translucent ? TRANSLUCENT_TERRAIN : OPAQUE_TERRAIN;
- } else if (sprite.atlasLocation().equals(TextureAtlas.LOCATION_ITEMS)) {
- return translucent ? TRANSLUCENT_ITEMS : OPAQUE_ITEMS;
- } else {
- return translucent ? TRANSLUCENT : OPAQUE;
- }
- }
- }
-}
diff --git a/net/minecraft/world/level/Level.java b/net/minecraft/world/level/Level.java
deleted file mode 100644
index db8fc58c..00000000
--- a/net/minecraft/world/level/Level.java
+++ /dev/null
@@ -1,1122 +0,0 @@
-package net.minecraft.world.level;
-
-import com.google.common.collect.Lists;
-import com.mojang.serialization.Codec;
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
-import javax.annotation.Nullable;
-import net.minecraft.CrashReport;
-import net.minecraft.CrashReportCategory;
-import net.minecraft.ReportedException;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.core.Holder;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.core.SectionPos;
-import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.core.registries.BuiltInRegistries;
-import net.minecraft.core.registries.Registries;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.FullChunkStatus;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.util.AbortableIterationConsumer;
-import net.minecraft.util.Mth;
-import net.minecraft.util.RandomSource;
-import net.minecraft.util.StringRepresentable;
-import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraft.world.DifficultyInstance;
-import net.minecraft.world.TickRateManager;
-import net.minecraft.world.damagesource.DamageSource;
-import net.minecraft.world.damagesource.DamageSources;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.boss.EnderDragonPart;
-import net.minecraft.world.entity.boss.enderdragon.EnderDragon;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.alchemy.PotionBrewing;
-import net.minecraft.world.item.component.FireworkExplosion;
-import net.minecraft.world.item.crafting.RecipeManager;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.BiomeManager;
-import net.minecraft.world.level.block.BaseFireBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.TickingBlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.border.WorldBorder;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.status.ChunkStatus;
-import net.minecraft.world.level.dimension.DimensionType;
-import net.minecraft.world.level.entity.EntityTypeTest;
-import net.minecraft.world.level.entity.LevelEntityGetter;
-import net.minecraft.world.level.gameevent.GameEvent;
-import net.minecraft.world.level.levelgen.Heightmap;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.level.material.Fluids;
-import net.minecraft.world.level.redstone.CollectingNeighborUpdater;
-import net.minecraft.world.level.redstone.NeighborUpdater;
-import net.minecraft.world.level.saveddata.maps.MapId;
-import net.minecraft.world.level.saveddata.maps.MapItemSavedData;
-import net.minecraft.world.level.storage.LevelData;
-import net.minecraft.world.level.storage.WritableLevelData;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.scores.Scoreboard;
-
-public abstract class Level implements LevelAccessor, AutoCloseable {
- public static final Codec> RESOURCE_KEY_CODEC = ResourceKey.codec(Registries.DIMENSION);
- public static final ResourceKey OVERWORLD = ResourceKey.create(Registries.DIMENSION, ResourceLocation.withDefaultNamespace("overworld"));
- public static final ResourceKey NETHER = ResourceKey.create(Registries.DIMENSION, ResourceLocation.withDefaultNamespace("the_nether"));
- public static final ResourceKey END = ResourceKey.create(Registries.DIMENSION, ResourceLocation.withDefaultNamespace("the_end"));
- public static final int MAX_LEVEL_SIZE = 30000000;
- public static final int LONG_PARTICLE_CLIP_RANGE = 512;
- public static final int SHORT_PARTICLE_CLIP_RANGE = 32;
- public static final int MAX_BRIGHTNESS = 15;
- public static final int TICKS_PER_DAY = 24000;
- public static final int MAX_ENTITY_SPAWN_Y = 20000000;
- public static final int MIN_ENTITY_SPAWN_Y = -20000000;
- protected final List blockEntityTickers = Lists.newArrayList();
- protected final NeighborUpdater neighborUpdater;
- private final List pendingBlockEntityTickers = Lists.newArrayList();
- private boolean tickingBlockEntities;
- private final Thread thread;
- private final boolean isDebug;
- private int skyDarken;
- protected int randValue = RandomSource.create().nextInt();
- protected final int addend = 1013904223;
- protected float oRainLevel;
- protected float rainLevel;
- protected float oThunderLevel;
- protected float thunderLevel;
- public final RandomSource random = RandomSource.create();
- @Deprecated
- private final RandomSource threadSafeRandom = RandomSource.createThreadSafe();
- private final Holder dimensionTypeRegistration;
- protected final WritableLevelData levelData;
- private final Supplier profiler;
- public final boolean isClientSide;
- private final WorldBorder worldBorder;
- private final BiomeManager biomeManager;
- private final ResourceKey dimension;
- private final RegistryAccess registryAccess;
- private final DamageSources damageSources;
- private long subTickCount;
-
- protected Level(
- WritableLevelData p_270739_,
- ResourceKey p_270683_,
- RegistryAccess p_270200_,
- Holder p_270240_,
- Supplier p_270692_,
- boolean p_270904_,
- boolean p_270470_,
- long p_270248_,
- int p_270466_
- ) {
- this.profiler = p_270692_;
- this.levelData = p_270739_;
- this.dimensionTypeRegistration = p_270240_;
- final DimensionType dimensiontype = p_270240_.value();
- this.dimension = p_270683_;
- this.isClientSide = p_270904_;
- if (dimensiontype.coordinateScale() != 1.0) {
- this.worldBorder = new WorldBorder() {
- @Override
- public double getCenterX() {
- return super.getCenterX() / dimensiontype.coordinateScale();
- }
-
- @Override
- public double getCenterZ() {
- return super.getCenterZ() / dimensiontype.coordinateScale();
- }
- };
- } else {
- this.worldBorder = new WorldBorder();
- }
-
- this.thread = Thread.currentThread();
- this.biomeManager = new BiomeManager(this, p_270248_);
- this.isDebug = p_270470_;
- this.neighborUpdater = new CollectingNeighborUpdater(this, p_270466_);
- this.registryAccess = p_270200_;
- this.damageSources = new DamageSources(p_270200_);
- }
-
- @Override
- public boolean isClientSide() {
- return this.isClientSide;
- }
-
- @Nullable
- @Override
- public MinecraftServer getServer() {
- return null;
- }
-
- public boolean isInWorldBounds(BlockPos p_46740_) {
- return !this.isOutsideBuildHeight(p_46740_) && isInWorldBoundsHorizontal(p_46740_);
- }
-
- public static boolean isInSpawnableBounds(BlockPos p_46742_) {
- return !isOutsideSpawnableHeight(p_46742_.getY()) && isInWorldBoundsHorizontal(p_46742_);
- }
-
- private static boolean isInWorldBoundsHorizontal(BlockPos p_46458_) {
- return p_46458_.getX() >= -30000000 && p_46458_.getZ() >= -30000000 && p_46458_.getX() < 30000000 && p_46458_.getZ() < 30000000;
- }
-
- private static boolean isOutsideSpawnableHeight(int p_46725_) {
- return p_46725_ < -20000000 || p_46725_ >= 20000000;
- }
-
- public LevelChunk getChunkAt(BlockPos p_46746_) {
- return this.getChunk(SectionPos.blockToSectionCoord(p_46746_.getX()), SectionPos.blockToSectionCoord(p_46746_.getZ()));
- }
-
- public LevelChunk getChunk(int p_46727_, int p_46728_) {
- return (LevelChunk)this.getChunk(p_46727_, p_46728_, ChunkStatus.FULL);
- }
-
- @Nullable
- @Override
- public ChunkAccess getChunk(int p_46502_, int p_46503_, ChunkStatus p_331611_, boolean p_46505_) {
- ChunkAccess chunkaccess = this.getChunkSource().getChunk(p_46502_, p_46503_, p_331611_, p_46505_);
- if (chunkaccess == null && p_46505_) {
- throw new IllegalStateException("Should always be able to create a chunk!");
- } else {
- return chunkaccess;
- }
- }
-
- @Override
- public boolean setBlock(BlockPos p_46601_, BlockState p_46602_, int p_46603_) {
- return this.setBlock(p_46601_, p_46602_, p_46603_, 512);
- }
-
- @Override
- public boolean setBlock(BlockPos p_46605_, BlockState p_46606_, int p_46607_, int p_46608_) {
- if (this.isOutsideBuildHeight(p_46605_)) {
- return false;
- } else if (!this.isClientSide && this.isDebug()) {
- return false;
- } else {
- LevelChunk levelchunk = this.getChunkAt(p_46605_);
- Block block = p_46606_.getBlock();
- BlockState blockstate = levelchunk.setBlockState(p_46605_, p_46606_, (p_46607_ & 64) != 0);
- if (blockstate == null) {
- return false;
- } else {
- BlockState blockstate1 = this.getBlockState(p_46605_);
- if (blockstate1 == p_46606_) {
- if (blockstate != blockstate1) {
- this.setBlocksDirty(p_46605_, blockstate, blockstate1);
- }
-
- if ((p_46607_ & 2) != 0
- && (!this.isClientSide || (p_46607_ & 4) == 0)
- && (this.isClientSide || levelchunk.getFullStatus() != null && levelchunk.getFullStatus().isOrAfter(FullChunkStatus.BLOCK_TICKING))) {
- this.sendBlockUpdated(p_46605_, blockstate, p_46606_, p_46607_);
- }
-
- if ((p_46607_ & 1) != 0) {
- this.blockUpdated(p_46605_, blockstate.getBlock());
- if (!this.isClientSide && p_46606_.hasAnalogOutputSignal()) {
- this.updateNeighbourForOutputSignal(p_46605_, block);
- }
- }
-
- if ((p_46607_ & 16) == 0 && p_46608_ > 0) {
- int i = p_46607_ & -34;
- blockstate.updateIndirectNeighbourShapes(this, p_46605_, i, p_46608_ - 1);
- p_46606_.updateNeighbourShapes(this, p_46605_, i, p_46608_ - 1);
- p_46606_.updateIndirectNeighbourShapes(this, p_46605_, i, p_46608_ - 1);
- }
-
- this.onBlockStateChange(p_46605_, blockstate, blockstate1);
- }
-
- return true;
- }
- }
- }
-
- public void onBlockStateChange(BlockPos p_46609_, BlockState p_46610_, BlockState p_46611_) {
- }
-
- @Override
- public boolean removeBlock(BlockPos p_46623_, boolean p_46624_) {
- FluidState fluidstate = this.getFluidState(p_46623_);
- return this.setBlock(p_46623_, fluidstate.createLegacyBlock(), 3 | (p_46624_ ? 64 : 0));
- }
-
- @Override
- public boolean destroyBlock(BlockPos p_46626_, boolean p_46627_, @Nullable Entity p_46628_, int p_46629_) {
- BlockState blockstate = this.getBlockState(p_46626_);
- if (blockstate.isAir()) {
- return false;
- } else {
- FluidState fluidstate = this.getFluidState(p_46626_);
- if (!(blockstate.getBlock() instanceof BaseFireBlock)) {
- this.levelEvent(2001, p_46626_, Block.getId(blockstate));
- }
-
- if (p_46627_) {
- BlockEntity blockentity = blockstate.hasBlockEntity() ? this.getBlockEntity(p_46626_) : null;
- Block.dropResources(blockstate, this, p_46626_, blockentity, p_46628_, ItemStack.EMPTY);
- }
-
- boolean flag = this.setBlock(p_46626_, fluidstate.createLegacyBlock(), 3, p_46629_);
- if (flag) {
- this.gameEvent(GameEvent.BLOCK_DESTROY, p_46626_, GameEvent.Context.of(p_46628_, blockstate));
- }
-
- return flag;
- }
- }
-
- public void addDestroyBlockEffect(BlockPos p_151531_, BlockState p_151532_) {
- }
-
- public boolean setBlockAndUpdate(BlockPos p_46598_, BlockState p_46599_) {
- return this.setBlock(p_46598_, p_46599_, 3);
- }
-
- public abstract void sendBlockUpdated(BlockPos p_46612_, BlockState p_46613_, BlockState p_46614_, int p_46615_);
-
- public void setBlocksDirty(BlockPos p_46678_, BlockState p_46679_, BlockState p_46680_) {
- }
-
- public void updateNeighborsAt(BlockPos p_46673_, Block p_46674_) {
- }
-
- public void updateNeighborsAtExceptFromFacing(BlockPos p_46591_, Block p_46592_, Direction p_46593_) {
- }
-
- public void neighborChanged(BlockPos p_46587_, Block p_46588_, BlockPos p_46589_) {
- }
-
- public void neighborChanged(BlockState p_220379_, BlockPos p_220380_, Block p_220381_, BlockPos p_220382_, boolean p_220383_) {
- }
-
- @Override
- public void neighborShapeChanged(Direction p_220385_, BlockState p_220386_, BlockPos p_220387_, BlockPos p_220388_, int p_220389_, int p_220390_) {
- this.neighborUpdater.shapeUpdate(p_220385_, p_220386_, p_220387_, p_220388_, p_220389_, p_220390_);
- }
-
- @Override
- public int getHeight(Heightmap.Types p_46571_, int p_46572_, int p_46573_) {
- int i;
- if (p_46572_ >= -30000000 && p_46573_ >= -30000000 && p_46572_ < 30000000 && p_46573_ < 30000000) {
- if (this.hasChunk(SectionPos.blockToSectionCoord(p_46572_), SectionPos.blockToSectionCoord(p_46573_))) {
- i = this.getChunk(SectionPos.blockToSectionCoord(p_46572_), SectionPos.blockToSectionCoord(p_46573_))
- .getHeight(p_46571_, p_46572_ & 15, p_46573_ & 15)
- + 1;
- } else {
- i = this.getMinBuildHeight();
- }
- } else {
- i = this.getSeaLevel() + 1;
- }
-
- return i;
- }
-
- @Override
- public LevelLightEngine getLightEngine() {
- return this.getChunkSource().getLightEngine();
- }
-
- @Override
- public BlockState getBlockState(BlockPos p_46732_) {
- if (this.isOutsideBuildHeight(p_46732_)) {
- return Blocks.VOID_AIR.defaultBlockState();
- } else {
- LevelChunk levelchunk = this.getChunk(SectionPos.blockToSectionCoord(p_46732_.getX()), SectionPos.blockToSectionCoord(p_46732_.getZ()));
- return levelchunk.getBlockState(p_46732_);
- }
- }
-
- @Override
- public FluidState getFluidState(BlockPos p_46671_) {
- if (this.isOutsideBuildHeight(p_46671_)) {
- return Fluids.EMPTY.defaultFluidState();
- } else {
- LevelChunk levelchunk = this.getChunkAt(p_46671_);
- return levelchunk.getFluidState(p_46671_);
- }
- }
-
- public boolean isDay() {
- return !this.dimensionType().hasFixedTime() && this.skyDarken < 4;
- }
-
- public boolean isNight() {
- return !this.dimensionType().hasFixedTime() && !this.isDay();
- }
-
- public void playSound(@Nullable Entity p_252137_, BlockPos p_251749_, SoundEvent p_248842_, SoundSource p_251104_, float p_249531_, float p_250763_) {
- this.playSound(p_252137_ instanceof Player player ? player : null, p_251749_, p_248842_, p_251104_, p_249531_, p_250763_);
- }
-
- @Override
- public void playSound(@Nullable Player p_46560_, BlockPos p_46561_, SoundEvent p_46562_, SoundSource p_46563_, float p_46564_, float p_46565_) {
- this.playSound(
- p_46560_, (double)p_46561_.getX() + 0.5, (double)p_46561_.getY() + 0.5, (double)p_46561_.getZ() + 0.5, p_46562_, p_46563_, p_46564_, p_46565_
- );
- }
-
- public abstract void playSeededSound(
- @Nullable Player p_262953_,
- double p_263004_,
- double p_263398_,
- double p_263376_,
- Holder p_263359_,
- SoundSource p_263020_,
- float p_263055_,
- float p_262914_,
- long p_262991_
- );
-
- public void playSeededSound(
- @Nullable Player p_220363_,
- double p_220364_,
- double p_220365_,
- double p_220366_,
- SoundEvent p_220367_,
- SoundSource p_220368_,
- float p_220369_,
- float p_220370_,
- long p_220371_
- ) {
- this.playSeededSound(
- p_220363_, p_220364_, p_220365_, p_220366_, BuiltInRegistries.SOUND_EVENT.wrapAsHolder(p_220367_), p_220368_, p_220369_, p_220370_, p_220371_
- );
- }
-
- public abstract void playSeededSound(
- @Nullable Player p_220372_, Entity p_220373_, Holder p_263500_, SoundSource p_220375_, float p_220376_, float p_220377_, long p_220378_
- );
-
- public void playSound(@Nullable Player p_309201_, double p_308925_, double p_309072_, double p_308916_, SoundEvent p_308917_, SoundSource p_308902_) {
- this.playSound(p_309201_, p_308925_, p_309072_, p_308916_, p_308917_, p_308902_, 1.0F, 1.0F);
- }
-
- public void playSound(
- @Nullable Player p_46543_, double p_46544_, double p_46545_, double p_46546_, SoundEvent p_46547_, SoundSource p_46548_, float p_46549_, float p_46550_
- ) {
- this.playSeededSound(p_46543_, p_46544_, p_46545_, p_46546_, p_46547_, p_46548_, p_46549_, p_46550_, this.threadSafeRandom.nextLong());
- }
-
- public void playSound(
- @Nullable Player p_347719_,
- double p_347460_,
- double p_347457_,
- double p_347558_,
- Holder p_347499_,
- SoundSource p_347522_,
- float p_347447_,
- float p_347667_
- ) {
- this.playSeededSound(p_347719_, p_347460_, p_347457_, p_347558_, p_347499_, p_347522_, p_347447_, p_347667_, this.threadSafeRandom.nextLong());
- }
-
- public void playSound(@Nullable Player p_46551_, Entity p_46552_, SoundEvent p_46553_, SoundSource p_46554_, float p_46555_, float p_46556_) {
- this.playSeededSound(
- p_46551_, p_46552_, BuiltInRegistries.SOUND_EVENT.wrapAsHolder(p_46553_), p_46554_, p_46555_, p_46556_, this.threadSafeRandom.nextLong()
- );
- }
-
- public void playLocalSound(BlockPos p_250938_, SoundEvent p_252209_, SoundSource p_249161_, float p_249980_, float p_250277_, boolean p_250151_) {
- this.playLocalSound(
- (double)p_250938_.getX() + 0.5,
- (double)p_250938_.getY() + 0.5,
- (double)p_250938_.getZ() + 0.5,
- p_252209_,
- p_249161_,
- p_249980_,
- p_250277_,
- p_250151_
- );
- }
-
- public void playLocalSound(Entity p_312189_, SoundEvent p_312080_, SoundSource p_312905_, float p_312914_, float p_312831_) {
- }
-
- public void playLocalSound(
- double p_46482_, double p_46483_, double p_46484_, SoundEvent p_46485_, SoundSource p_46486_, float p_46487_, float p_46488_, boolean p_46489_
- ) {
- }
-
- @Override
- public void addParticle(ParticleOptions p_46631_, double p_46632_, double p_46633_, double p_46634_, double p_46635_, double p_46636_, double p_46637_) {
- }
-
- public void addParticle(
- ParticleOptions p_46638_, boolean p_46639_, double p_46640_, double p_46641_, double p_46642_, double p_46643_, double p_46644_, double p_46645_
- ) {
- }
-
- public void addAlwaysVisibleParticle(
- ParticleOptions p_46684_, double p_46685_, double p_46686_, double p_46687_, double p_46688_, double p_46689_, double p_46690_
- ) {
- }
-
- public void addAlwaysVisibleParticle(
- ParticleOptions p_46691_, boolean p_46692_, double p_46693_, double p_46694_, double p_46695_, double p_46696_, double p_46697_, double p_46698_
- ) {
- }
-
- public float getSunAngle(float p_46491_) {
- float f = this.getTimeOfDay(p_46491_);
- return f * (float) (Math.PI * 2);
- }
-
- public void addBlockEntityTicker(TickingBlockEntity p_151526_) {
- (this.tickingBlockEntities ? this.pendingBlockEntityTickers : this.blockEntityTickers).add(p_151526_);
- }
-
- protected void tickBlockEntities() {
- ProfilerFiller profilerfiller = this.getProfiler();
- profilerfiller.push("blockEntities");
- this.tickingBlockEntities = true;
- if (!this.pendingBlockEntityTickers.isEmpty()) {
- this.blockEntityTickers.addAll(this.pendingBlockEntityTickers);
- this.pendingBlockEntityTickers.clear();
- }
-
- Iterator iterator = this.blockEntityTickers.iterator();
- boolean flag = this.tickRateManager().runsNormally();
-
- while (iterator.hasNext()) {
- TickingBlockEntity tickingblockentity = iterator.next();
- if (tickingblockentity.isRemoved()) {
- iterator.remove();
- } else if (flag && this.shouldTickBlocksAt(tickingblockentity.getPos())) {
- tickingblockentity.tick();
- }
- }
-
- this.tickingBlockEntities = false;
- profilerfiller.pop();
- }
-
- public void guardEntityTick(Consumer p_46654_, T p_46655_) {
- try {
- p_46654_.accept(p_46655_);
- } catch (Throwable throwable) {
- CrashReport crashreport = CrashReport.forThrowable(throwable, "Ticking entity");
- CrashReportCategory crashreportcategory = crashreport.addCategory("Entity being ticked");
- p_46655_.fillCrashReportCategory(crashreportcategory);
- throw new ReportedException(crashreport);
- }
- }
-
- public boolean shouldTickDeath(Entity p_186458_) {
- return true;
- }
-
- public boolean shouldTickBlocksAt(long p_186456_) {
- return true;
- }
-
- public boolean shouldTickBlocksAt(BlockPos p_220394_) {
- return this.shouldTickBlocksAt(ChunkPos.asLong(p_220394_));
- }
-
- public Explosion explode(
- @Nullable Entity p_256599_, double p_255914_, double p_255684_, double p_255843_, float p_256310_, Level.ExplosionInteraction p_256178_
- ) {
- return this.explode(
- p_256599_,
- Explosion.getDefaultDamageSource(this, p_256599_),
- null,
- p_255914_,
- p_255684_,
- p_255843_,
- p_256310_,
- false,
- p_256178_,
- ParticleTypes.EXPLOSION,
- ParticleTypes.EXPLOSION_EMITTER,
- SoundEvents.GENERIC_EXPLODE
- );
- }
-
- public Explosion explode(
- @Nullable Entity p_255682_,
- double p_255803_,
- double p_256403_,
- double p_256538_,
- float p_255674_,
- boolean p_256634_,
- Level.ExplosionInteraction p_256111_
- ) {
- return this.explode(
- p_255682_,
- Explosion.getDefaultDamageSource(this, p_255682_),
- null,
- p_255803_,
- p_256403_,
- p_256538_,
- p_255674_,
- p_256634_,
- p_256111_,
- ParticleTypes.EXPLOSION,
- ParticleTypes.EXPLOSION_EMITTER,
- SoundEvents.GENERIC_EXPLODE
- );
- }
-
- public Explosion explode(
- @Nullable Entity p_255653_,
- @Nullable DamageSource p_256558_,
- @Nullable ExplosionDamageCalculator p_255929_,
- Vec3 p_256001_,
- float p_255963_,
- boolean p_256099_,
- Level.ExplosionInteraction p_256371_
- ) {
- return this.explode(
- p_255653_,
- p_256558_,
- p_255929_,
- p_256001_.x(),
- p_256001_.y(),
- p_256001_.z(),
- p_255963_,
- p_256099_,
- p_256371_,
- ParticleTypes.EXPLOSION,
- ParticleTypes.EXPLOSION_EMITTER,
- SoundEvents.GENERIC_EXPLODE
- );
- }
-
- public Explosion explode(
- @Nullable Entity p_256145_,
- @Nullable DamageSource p_256004_,
- @Nullable ExplosionDamageCalculator p_255696_,
- double p_256208_,
- double p_256036_,
- double p_255746_,
- float p_256647_,
- boolean p_256098_,
- Level.ExplosionInteraction p_256104_
- ) {
- return this.explode(
- p_256145_,
- p_256004_,
- p_255696_,
- p_256208_,
- p_256036_,
- p_255746_,
- p_256647_,
- p_256098_,
- p_256104_,
- ParticleTypes.EXPLOSION,
- ParticleTypes.EXPLOSION_EMITTER,
- SoundEvents.GENERIC_EXPLODE
- );
- }
-
- public Explosion explode(
- @Nullable Entity p_256233_,
- @Nullable DamageSource p_255861_,
- @Nullable ExplosionDamageCalculator p_255867_,
- double p_256447_,
- double p_255732_,
- double p_255717_,
- float p_256013_,
- boolean p_256228_,
- Level.ExplosionInteraction p_255784_,
- ParticleOptions p_311886_,
- ParticleOptions p_311887_,
- Holder p_320084_
- ) {
- return this.explode(
- p_256233_, p_255861_, p_255867_, p_256447_, p_255732_, p_255717_, p_256013_, p_256228_, p_255784_, true, p_311886_, p_311887_, p_320084_
- );
- }
-
- public Explosion explode(
- @Nullable Entity p_311934_,
- @Nullable DamageSource p_312790_,
- @Nullable ExplosionDamageCalculator p_311975_,
- double p_312493_,
- double p_312456_,
- double p_312719_,
- float p_312292_,
- boolean p_312144_,
- Level.ExplosionInteraction p_312265_,
- boolean p_312145_,
- ParticleOptions p_312842_,
- ParticleOptions p_312060_,
- Holder p_320283_
- ) {
- Explosion.BlockInteraction explosion$blockinteraction = switch (p_312265_) {
- case NONE -> Explosion.BlockInteraction.KEEP;
- case BLOCK -> this.getDestroyType(GameRules.RULE_BLOCK_EXPLOSION_DROP_DECAY);
- case MOB -> this.getGameRules().getBoolean(GameRules.RULE_MOBGRIEFING)
- ? this.getDestroyType(GameRules.RULE_MOB_EXPLOSION_DROP_DECAY)
- : Explosion.BlockInteraction.KEEP;
- case TNT -> this.getDestroyType(GameRules.RULE_TNT_EXPLOSION_DROP_DECAY);
- case TRIGGER -> Explosion.BlockInteraction.TRIGGER_BLOCK;
- };
- Explosion explosion = new Explosion(
- this,
- p_311934_,
- p_312790_,
- p_311975_,
- p_312493_,
- p_312456_,
- p_312719_,
- p_312292_,
- p_312144_,
- explosion$blockinteraction,
- p_312842_,
- p_312060_,
- p_320283_
- );
- explosion.explode();
- explosion.finalizeExplosion(p_312145_);
- return explosion;
- }
-
- private Explosion.BlockInteraction getDestroyType(GameRules.Key p_256250_) {
- return this.getGameRules().getBoolean(p_256250_) ? Explosion.BlockInteraction.DESTROY_WITH_DECAY : Explosion.BlockInteraction.DESTROY;
- }
-
- public abstract String gatherChunkSourceStats();
-
- @Nullable
- @Override
- public BlockEntity getBlockEntity(BlockPos p_46716_) {
- if (this.isOutsideBuildHeight(p_46716_)) {
- return null;
- } else {
- return !this.isClientSide && Thread.currentThread() != this.thread
- ? null
- : this.getChunkAt(p_46716_).getBlockEntity(p_46716_, LevelChunk.EntityCreationType.IMMEDIATE);
- }
- }
-
- public void setBlockEntity(BlockEntity p_151524_) {
- BlockPos blockpos = p_151524_.getBlockPos();
- if (!this.isOutsideBuildHeight(blockpos)) {
- this.getChunkAt(blockpos).addAndRegisterBlockEntity(p_151524_);
- }
- }
-
- public void removeBlockEntity(BlockPos p_46748_) {
- if (!this.isOutsideBuildHeight(p_46748_)) {
- this.getChunkAt(p_46748_).removeBlockEntity(p_46748_);
- }
- }
-
- public boolean isLoaded(BlockPos p_46750_) {
- return this.isOutsideBuildHeight(p_46750_)
- ? false
- : this.getChunkSource().hasChunk(SectionPos.blockToSectionCoord(p_46750_.getX()), SectionPos.blockToSectionCoord(p_46750_.getZ()));
- }
-
- public boolean loadedAndEntityCanStandOnFace(BlockPos p_46579_, Entity p_46580_, Direction p_46581_) {
- if (this.isOutsideBuildHeight(p_46579_)) {
- return false;
- } else {
- ChunkAccess chunkaccess = this.getChunk(
- SectionPos.blockToSectionCoord(p_46579_.getX()), SectionPos.blockToSectionCoord(p_46579_.getZ()), ChunkStatus.FULL, false
- );
- return chunkaccess == null ? false : chunkaccess.getBlockState(p_46579_).entityCanStandOnFace(this, p_46579_, p_46580_, p_46581_);
- }
- }
-
- public boolean loadedAndEntityCanStandOn(BlockPos p_46576_, Entity p_46577_) {
- return this.loadedAndEntityCanStandOnFace(p_46576_, p_46577_, Direction.UP);
- }
-
- public void updateSkyBrightness() {
- double d0 = 1.0 - (double)(this.getRainLevel(1.0F) * 5.0F) / 16.0;
- double d1 = 1.0 - (double)(this.getThunderLevel(1.0F) * 5.0F) / 16.0;
- double d2 = 0.5 + 2.0 * Mth.clamp((double)Mth.cos(this.getTimeOfDay(1.0F) * (float) (Math.PI * 2)), -0.25, 0.25);
- this.skyDarken = (int)((1.0 - d2 * d0 * d1) * 11.0);
- }
-
- public void setSpawnSettings(boolean p_46704_, boolean p_46705_) {
- this.getChunkSource().setSpawnSettings(p_46704_, p_46705_);
- }
-
- public BlockPos getSharedSpawnPos() {
- BlockPos blockpos = this.levelData.getSpawnPos();
- if (!this.getWorldBorder().isWithinBounds(blockpos)) {
- blockpos = this.getHeightmapPos(
- Heightmap.Types.MOTION_BLOCKING, BlockPos.containing(this.getWorldBorder().getCenterX(), 0.0, this.getWorldBorder().getCenterZ())
- );
- }
-
- return blockpos;
- }
-
- public float getSharedSpawnAngle() {
- return this.levelData.getSpawnAngle();
- }
-
- protected void prepareWeather() {
- if (this.levelData.isRaining()) {
- this.rainLevel = 1.0F;
- if (this.levelData.isThundering()) {
- this.thunderLevel = 1.0F;
- }
- }
- }
-
- @Override
- public void close() throws IOException {
- this.getChunkSource().close();
- }
-
- @Nullable
- @Override
- public BlockGetter getChunkForCollisions(int p_46711_, int p_46712_) {
- return this.getChunk(p_46711_, p_46712_, ChunkStatus.FULL, false);
- }
-
- @Override
- public List getEntities(@Nullable Entity p_46536_, AABB p_46537_, Predicate p_46538_) {
- this.getProfiler().incrementCounter("getEntities");
- List list = Lists.newArrayList();
- this.getEntities().get(p_46537_, p_151522_ -> {
- if (p_151522_ != p_46536_ && p_46538_.test(p_151522_)) {
- list.add(p_151522_);
- }
-
- if (p_151522_ instanceof EnderDragon) {
- for (EnderDragonPart enderdragonpart : ((EnderDragon)p_151522_).getSubEntities()) {
- if (p_151522_ != p_46536_ && p_46538_.test(enderdragonpart)) {
- list.add(enderdragonpart);
- }
- }
- }
- });
- return list;
- }
-
- @Override
- public List getEntities(EntityTypeTest p_151528_, AABB p_151529_, Predicate p_151530_) {
- List list = Lists.newArrayList();
- this.getEntities(p_151528_, p_151529_, p_151530_, list);
- return list;
- }
-
- public void getEntities(EntityTypeTest p_261899_, AABB p_261837_, Predicate p_261519_, List p_262046_) {
- this.getEntities(p_261899_, p_261837_, p_261519_, p_262046_, Integer.MAX_VALUE);
- }
-
- public void getEntities(
- EntityTypeTest p_261885_, AABB p_262086_, Predicate p_261688_, List p_262071_, int p_261858_
- ) {
- this.getProfiler().incrementCounter("getEntities");
- this.getEntities().get(p_261885_, p_262086_, p_261454_ -> {
- if (p_261688_.test(p_261454_)) {
- p_262071_.add(p_261454_);
- if (p_262071_.size() >= p_261858_) {
- return AbortableIterationConsumer.Continuation.ABORT;
- }
- }
-
- if (p_261454_ instanceof EnderDragon enderdragon) {
- for (EnderDragonPart enderdragonpart : enderdragon.getSubEntities()) {
- T t = p_261885_.tryCast(enderdragonpart);
- if (t != null && p_261688_.test(t)) {
- p_262071_.add(t);
- if (p_262071_.size() >= p_261858_) {
- return AbortableIterationConsumer.Continuation.ABORT;
- }
- }
- }
- }
-
- return AbortableIterationConsumer.Continuation.CONTINUE;
- });
- }
-
- @Nullable
- public abstract Entity getEntity(int p_46492_);
-
- public void blockEntityChanged(BlockPos p_151544_) {
- if (this.hasChunkAt(p_151544_)) {
- this.getChunkAt(p_151544_).setUnsaved(true);
- }
- }
-
- @Override
- public int getSeaLevel() {
- return 63;
- }
-
- public void disconnect() {
- }
-
- public long getGameTime() {
- return this.levelData.getGameTime();
- }
-
- public long getDayTime() {
- return this.levelData.getDayTime();
- }
-
- public boolean mayInteract(Player p_46557_, BlockPos p_46558_) {
- return true;
- }
-
- public void broadcastEntityEvent(Entity p_46509_, byte p_46510_) {
- }
-
- public void broadcastDamageEvent(Entity p_270831_, DamageSource p_270361_) {
- }
-
- public void blockEvent(BlockPos p_46582_, Block p_46583_, int p_46584_, int p_46585_) {
- this.getBlockState(p_46582_).triggerEvent(this, p_46582_, p_46584_, p_46585_);
- }
-
- @Override
- public LevelData getLevelData() {
- return this.levelData;
- }
-
- public GameRules getGameRules() {
- return this.levelData.getGameRules();
- }
-
- public abstract TickRateManager tickRateManager();
-
- public float getThunderLevel(float p_46662_) {
- return Mth.lerp(p_46662_, this.oThunderLevel, this.thunderLevel) * this.getRainLevel(p_46662_);
- }
-
- public void setThunderLevel(float p_46708_) {
- float f = Mth.clamp(p_46708_, 0.0F, 1.0F);
- this.oThunderLevel = f;
- this.thunderLevel = f;
- }
-
- public float getRainLevel(float p_46723_) {
- return Mth.lerp(p_46723_, this.oRainLevel, this.rainLevel);
- }
-
- public void setRainLevel(float p_46735_) {
- float f = Mth.clamp(p_46735_, 0.0F, 1.0F);
- this.oRainLevel = f;
- this.rainLevel = f;
- }
-
- public boolean isThundering() {
- return this.dimensionType().hasSkyLight() && !this.dimensionType().hasCeiling() ? (double)this.getThunderLevel(1.0F) > 0.9 : false;
- }
-
- public boolean isRaining() {
- return (double)this.getRainLevel(1.0F) > 0.2;
- }
-
- public boolean isRainingAt(BlockPos p_46759_) {
- if (!this.isRaining()) {
- return false;
- } else if (!this.canSeeSky(p_46759_)) {
- return false;
- } else if (this.getHeightmapPos(Heightmap.Types.MOTION_BLOCKING, p_46759_).getY() > p_46759_.getY()) {
- return false;
- } else {
- Biome biome = this.getBiome(p_46759_).value();
- return biome.getPrecipitationAt(p_46759_) == Biome.Precipitation.RAIN;
- }
- }
-
- @Nullable
- public abstract MapItemSavedData getMapData(MapId p_324234_);
-
- public abstract void setMapData(MapId p_324009_, MapItemSavedData p_151534_);
-
- public abstract MapId getFreeMapId();
-
- public void globalLevelEvent(int p_46665_, BlockPos p_46666_, int p_46667_) {
- }
-
- public CrashReportCategory fillReportDetails(CrashReport p_46656_) {
- CrashReportCategory crashreportcategory = p_46656_.addCategory("Affected level", 1);
- crashreportcategory.setDetail("All players", () -> this.players().size() + " total; " + this.players());
- crashreportcategory.setDetail("Chunk stats", this.getChunkSource()::gatherStats);
- crashreportcategory.setDetail("Level dimension", () -> this.dimension().location().toString());
-
- try {
- this.levelData.fillCrashReportCategory(crashreportcategory, this);
- } catch (Throwable throwable) {
- crashreportcategory.setDetailError("Level Data Unobtainable", throwable);
- }
-
- return crashreportcategory;
- }
-
- public abstract void destroyBlockProgress(int p_46506_, BlockPos p_46507_, int p_46508_);
-
- public void createFireworks(
- double p_46475_, double p_46476_, double p_46477_, double p_46478_, double p_46479_, double p_46480_, List p_332050_
- ) {
- }
-
- public abstract Scoreboard getScoreboard();
-
- public void updateNeighbourForOutputSignal(BlockPos p_46718_, Block p_46719_) {
- for (Direction direction : Direction.Plane.HORIZONTAL) {
- BlockPos blockpos = p_46718_.relative(direction);
- if (this.hasChunkAt(blockpos)) {
- BlockState blockstate = this.getBlockState(blockpos);
- if (blockstate.is(Blocks.COMPARATOR)) {
- this.neighborChanged(blockstate, blockpos, p_46719_, p_46718_, false);
- } else if (blockstate.isRedstoneConductor(this, blockpos)) {
- blockpos = blockpos.relative(direction);
- blockstate = this.getBlockState(blockpos);
- if (blockstate.is(Blocks.COMPARATOR)) {
- this.neighborChanged(blockstate, blockpos, p_46719_, p_46718_, false);
- }
- }
- }
- }
- }
-
- @Override
- public DifficultyInstance getCurrentDifficultyAt(BlockPos p_46730_) {
- long i = 0L;
- float f = 0.0F;
- if (this.hasChunkAt(p_46730_)) {
- f = this.getMoonBrightness();
- i = this.getChunkAt(p_46730_).getInhabitedTime();
- }
-
- return new DifficultyInstance(this.getDifficulty(), this.getDayTime(), i, f);
- }
-
- @Override
- public int getSkyDarken() {
- return this.skyDarken;
- }
-
- public void setSkyFlashTime(int p_46709_) {
- }
-
- @Override
- public WorldBorder getWorldBorder() {
- return this.worldBorder;
- }
-
- public void sendPacketToServer(Packet p_46657_) {
- throw new UnsupportedOperationException("Can't send packets to server unless you're on the client.");
- }
-
- @Override
- public DimensionType dimensionType() {
- return this.dimensionTypeRegistration.value();
- }
-
- public Holder dimensionTypeRegistration() {
- return this.dimensionTypeRegistration;
- }
-
- public ResourceKey dimension() {
- return this.dimension;
- }
-
- @Override
- public RandomSource getRandom() {
- return this.random;
- }
-
- @Override
- public boolean isStateAtPosition(BlockPos p_46620_, Predicate p_46621_) {
- return p_46621_.test(this.getBlockState(p_46620_));
- }
-
- @Override
- public boolean isFluidAtPosition(BlockPos p_151541_, Predicate p_151542_) {
- return p_151542_.test(this.getFluidState(p_151541_));
- }
-
- public abstract RecipeManager getRecipeManager();
-
- public BlockPos getBlockRandomPos(int p_46497_, int p_46498_, int p_46499_, int p_46500_) {
- this.randValue = this.randValue * 3 + 1013904223;
- int i = this.randValue >> 2;
- return new BlockPos(p_46497_ + (i & 15), p_46498_ + (i >> 16 & p_46500_), p_46499_ + (i >> 8 & 15));
- }
-
- public boolean noSave() {
- return false;
- }
-
- public ProfilerFiller getProfiler() {
- return this.profiler.get();
- }
-
- public Supplier getProfilerSupplier() {
- return this.profiler;
- }
-
- @Override
- public BiomeManager getBiomeManager() {
- return this.biomeManager;
- }
-
- public final boolean isDebug() {
- return this.isDebug;
- }
-
- protected abstract LevelEntityGetter getEntities();
-
- @Override
- public long nextSubTickCount() {
- return this.subTickCount++;
- }
-
- @Override
- public RegistryAccess registryAccess() {
- return this.registryAccess;
- }
-
- public DamageSources damageSources() {
- return this.damageSources;
- }
-
- public abstract PotionBrewing potionBrewing();
-
- public static enum ExplosionInteraction implements StringRepresentable {
- NONE("none"),
- BLOCK("block"),
- MOB("mob"),
- TNT("tnt"),
- TRIGGER("trigger");
-
- public static final Codec CODEC = StringRepresentable.fromEnum(Level.ExplosionInteraction::values);
- private final String id;
-
- private ExplosionInteraction(String p_346300_) {
- this.id = p_346300_;
- }
-
- @Override
- public String getSerializedName() {
- return this.id;
- }
- }
-}
diff --git a/net/neoforged/neoforge/client/event/RegisterParticleProvidersEvent.java b/net/neoforged/neoforge/client/event/RegisterParticleProvidersEvent.java
deleted file mode 100644
index a095112a..00000000
--- a/net/neoforged/neoforge/client/event/RegisterParticleProvidersEvent.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) Forge Development LLC and contributors
- * SPDX-License-Identifier: LGPL-2.1-only
- */
-
-package net.neoforged.neoforge.client.event;
-
-import net.minecraft.client.particle.ParticleEngine;
-import net.minecraft.client.particle.ParticleProvider;
-import net.minecraft.client.particle.TextureSheetParticle;
-import net.minecraft.core.particles.ParticleOptions;
-import net.minecraft.core.particles.ParticleType;
-import net.neoforged.bus.api.Event;
-import net.neoforged.bus.api.ICancellableEvent;
-import net.neoforged.fml.LogicalSide;
-import net.neoforged.fml.event.IModBusEvent;
-import net.neoforged.neoforge.registries.RegisterEvent;
-import org.jetbrains.annotations.ApiStatus;
-
-/**
- * Fired for registering particle providers at the appropriate time.
- *
- * {@link ParticleType}s must be registered during {@link RegisterEvent} as usual;
- * this event is only for the {@link ParticleProvider}s.
- *
- * This event is not {@linkplain ICancellableEvent cancellable}, and does not {@linkplain HasResult have a result}.
- *
- * This event is fired on the mod-specific event bus, only on the {@linkplain LogicalSide#CLIENT logical client}.
- */
-public class RegisterParticleProvidersEvent extends Event implements IModBusEvent {
- private final ParticleEngine particleEngine;
-
- @ApiStatus.Internal
- public RegisterParticleProvidersEvent(ParticleEngine particleEngine) {
- this.particleEngine = particleEngine;
- }
-
- /**
- * Registers a ParticleProvider for a non-json-based ParticleType.
- * These particles do not receive a list of texture sprites to use for rendering themselves.
- *
- * There must be no particle json with an ID matching the ParticleType,
- * or a redundant texture list error will occur when particle jsons load.
- *
- * @param ParticleOptions used by the ParticleType and ParticleProvider.
- * @param type ParticleType to register a ParticleProvider for.
- * @param provider ParticleProvider function responsible for providing that ParticleType's particles.
- */
- @SuppressWarnings("deprecation")
- public void registerSpecial(ParticleType type, ParticleProvider provider) {
- particleEngine.register(type, provider);
- }
-
- /**
- * Registers a ParticleProvider for a json-based ParticleType with a single texture;
- * the resulting {@link TextureSheetParticle}s will use that texture when created.
- *
- * A particle json with an ID matching the ParticleType must exist in the particles asset folder,
- * or a missing texture list error will occur when particle jsons load.
- *
- * @param ParticleOptions used by the ParticleType and Sprite function.
- * @param type ParticleType to register a ParticleProvider for.
- * @param sprite Sprite function responsible for providing that ParticleType's particles.
- */
- @SuppressWarnings("deprecation")
- public void registerSprite(ParticleType type, ParticleProvider.Sprite sprite) {
- particleEngine.register(type, sprite);
- }
-
- /**
- * Registers a ParticleProvider for a json-based ParticleType.
- * Particle jsons define a list of texture sprites which the particle can use to render itself.
- *
- * A particle json with an ID matching the ParticleType must exist in the particles asset folder,
- * or a missing texture list error will occur when particle jsons load.
- *
- * @param ParticleOptions used by the ParticleType and SpriteParticleRegistration function.
- * @param type ParticleType to register a particle provider for.
- * @param registration SpriteParticleRegistration function responsible for providing that ParticleType's particles.
- */
- @SuppressWarnings("deprecation")
- public void registerSpriteSet(ParticleType type, ParticleEngine.SpriteParticleRegistration registration) {
- particleEngine.register(type, registration);
- }
-}
diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json
index 794e6cf6..32871b94 100644
--- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json
+++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_ud.json
@@ -27,6 +27,8 @@
"anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml": "uoᴉʇɐɹnᵷᴉɟuoƆ ɹǝʌɹǝS snꞁdsᵷᴉԀ ʇɟɐɹɔꞁᴉʌuⱯ",
"anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml.title": "uoᴉʇɐɹnᵷᴉɟuoƆ ɹǝʌɹǝS snꞁdsᵷᴉԀ ʇɟɐɹɔꞁᴉʌuⱯ",
"anvilcraft_pigsplus.configuration.title": "uoᴉʇɐɹnᵷᴉɟuoƆ snꞁdsᵷᴉԀ ʇɟɐɹɔꞁᴉʌuⱯ",
+ "anvilcraft_pigsplus.configuration.void_acid_destroy": "ʎoɹʇsǝᗡ pᴉɔⱯ pᴉoɅ",
+ "anvilcraft_pigsplus.configuration.void_acid_destroy.tooltip": "sʞɔoꞁq ʎoɹʇsǝp oʇ pᴉɔⱯ pᴉoɅ ǝɥʇ ʍoꞁꞁⱯ",
"block.anvilcraft_pigsplus.adjustable_power_converter": "ɹǝʇɹǝʌuoƆ ɹǝʍoԀ ǝꞁqɐʇsnɾpⱯ",
"block.anvilcraft_pigsplus.auto_chicken": "uǝʞɔᴉɥƆ oʇnⱯ",
"block.anvilcraft_pigsplus.auto_jewel_crafting_table": "ǝꞁqɐ⟘ ᵷuᴉʇɟɐɹƆ ꞁǝʍǝՐ oʇnⱯ",
@@ -43,10 +45,11 @@
"block.anvilcraft_pigsplus.enchanted_generator.placement_too_close_to_another": "ɹoʇɐɹǝuǝᵷ pǝʇuɐɥɔuǝ ɹǝɥʇouɐ oʇ ǝsoꞁɔ oo⟘",
"block.anvilcraft_pigsplus.experience_interface": "ǝɔɐɟɹǝʇuI ǝɔuǝᴉɹǝdxƎ",
"block.anvilcraft_pigsplus.fake_menger_sponge": "ǝᵷuodS ɹǝᵷuǝW ǝʞɐℲ",
+ "block.anvilcraft_pigsplus.memory_block_comparator": "ɹoʇɐɹɐdɯoƆ ʞɔoꞁᗺ ʎɹoɯǝW",
+ "block.anvilcraft_pigsplus.memory_block_comparator.structure_too_large": "ɹoʇɐɹɐdɯoɔ ʞɔoꞁq ʎɹoɯǝɯ oʇuᴉ pɐoꞁ ʇouuɐɔ '⥝x⥝x⥝ uɐɥʇ ɹǝᵷɹɐꞁ sᴉ ǝɹnʇɔnɹʇs pǝʌɐS",
"block.anvilcraft_pigsplus.pig_anvil": "ꞁᴉʌuⱯ ᵷᴉԀ",
"block.anvilcraft_pigsplus.precision_magnetic_pivot": "ʇoʌᴉԀ ɔᴉʇǝuᵷɐW uoᴉsᴉɔǝɹԀ",
"block.anvilcraft_pigsplus.redstone_conduit_block": "ʞɔoꞁᗺ ʇᴉnpuoƆ ǝuoʇspǝᴚ",
- "block.anvilcraft_pigsplus.sculk_extractor": "ɹoʇɔɐɹʇxƎ ʞꞁnɔS",
"block.anvilcraft_pigsplus.void_acid": "pᴉɔⱯ pᴉoɅ",
"block.anvilcraft_pigsplus.void_acid_cauldron": "uoɹpꞁnɐƆ pᴉɔⱯ pᴉoɅ",
"block.anvilcraft_pigsplus.void_catalyst": "ʇsʎꞁɐʇɐƆ pᴉoɅ",
diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json
index c98595d3..425b233d 100644
--- a/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json
+++ b/src/generated/resources/assets/anvilcraft_pigsplus/lang/en_us.json
@@ -27,6 +27,8 @@
"anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml": "Anvilcraft Pigsplus Server Configuration",
"anvilcraft_pigsplus.configuration.section.anvilcraft_pigsplus.server.toml.title": "Anvilcraft Pigsplus Server Configuration",
"anvilcraft_pigsplus.configuration.title": "Anvilcraft Pigsplus Configuration",
+ "anvilcraft_pigsplus.configuration.void_acid_destroy": "Void Acid Destroy",
+ "anvilcraft_pigsplus.configuration.void_acid_destroy.tooltip": "Allow the Void Acid to destroy blocks",
"block.anvilcraft_pigsplus.adjustable_power_converter": "Adjustable Power Converter",
"block.anvilcraft_pigsplus.auto_chicken": "Auto Chicken",
"block.anvilcraft_pigsplus.auto_jewel_crafting_table": "Auto Jewel Crafting Table",
@@ -43,10 +45,11 @@
"block.anvilcraft_pigsplus.enchanted_generator.placement_too_close_to_another": "Too close to another enchanted generator",
"block.anvilcraft_pigsplus.experience_interface": "Experience Interface",
"block.anvilcraft_pigsplus.fake_menger_sponge": "Fake Menger Sponge",
+ "block.anvilcraft_pigsplus.memory_block_comparator": "Memory Block Comparator",
+ "block.anvilcraft_pigsplus.memory_block_comparator.structure_too_large": "Saved structure is larger than 1x1x1, cannot load into memory block comparator",
"block.anvilcraft_pigsplus.pig_anvil": "Pig Anvil",
"block.anvilcraft_pigsplus.precision_magnetic_pivot": "Precision Magnetic Pivot",
"block.anvilcraft_pigsplus.redstone_conduit_block": "Redstone Conduit Block",
- "block.anvilcraft_pigsplus.sculk_extractor": "Sculk Extractor",
"block.anvilcraft_pigsplus.void_acid": "Void Acid",
"block.anvilcraft_pigsplus.void_acid_cauldron": "Void Acid Cauldron",
"block.anvilcraft_pigsplus.void_catalyst": "Void Catalyst",
diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/models/item/memory_block_comparator.json b/src/generated/resources/assets/anvilcraft_pigsplus/models/item/memory_block_comparator.json
new file mode 100644
index 00000000..755df04e
--- /dev/null
+++ b/src/generated/resources/assets/anvilcraft_pigsplus/models/item/memory_block_comparator.json
@@ -0,0 +1,3 @@
+{
+ "parent": "anvilcraft_pigsplus:block/memory_block_comparator"
+}
\ No newline at end of file
diff --git a/src/generated/resources/assets/anvilcraft_pigsplus/models/item/sculk_extractor.json b/src/generated/resources/assets/anvilcraft_pigsplus/models/item/sculk_extractor.json
deleted file mode 100644
index 081ddb89..00000000
--- a/src/generated/resources/assets/anvilcraft_pigsplus/models/item/sculk_extractor.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "parent": "anvilcraft_pigsplus:block/sculk_extractor"
-}
\ No newline at end of file
diff --git a/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/misc/sculk_extractor.json b/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/misc/memory_block_comparator.json
similarity index 62%
rename from src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/misc/sculk_extractor.json
rename to src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/misc/memory_block_comparator.json
index 70fe2e18..63480a70 100644
--- a/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/misc/sculk_extractor.json
+++ b/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/misc/memory_block_comparator.json
@@ -1,11 +1,11 @@
{
"parent": "minecraft:recipes/root",
"criteria": {
- "has_echo_shard": {
+ "has_karakuri_component": {
"conditions": {
"items": [
{
- "items": "minecraft:echo_shard"
+ "items": "anvilcraft_pigsplus:karakuri_component"
}
]
},
@@ -13,7 +13,7 @@
},
"has_the_recipe": {
"conditions": {
- "recipe": "anvilcraft_pigsplus:sculk_extractor"
+ "recipe": "anvilcraft_pigsplus:memory_block_comparator"
},
"trigger": "minecraft:recipe_unlocked"
}
@@ -21,12 +21,12 @@
"requirements": [
[
"has_the_recipe",
- "has_echo_shard"
+ "has_karakuri_component"
]
],
"rewards": {
"recipes": [
- "anvilcraft_pigsplus:sculk_extractor"
+ "anvilcraft_pigsplus:memory_block_comparator"
]
}
}
\ No newline at end of file
diff --git a/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/redstone/stonecutting/memory_block_comparator.json b/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/redstone/stonecutting/memory_block_comparator.json
new file mode 100644
index 00000000..7fbe3d82
--- /dev/null
+++ b/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/redstone/stonecutting/memory_block_comparator.json
@@ -0,0 +1,32 @@
+{
+ "parent": "minecraft:recipes/root",
+ "criteria": {
+ "has_the_recipe": {
+ "conditions": {
+ "recipe": "anvilcraft_pigsplus:stonecutting/memory_block_comparator"
+ },
+ "trigger": "minecraft:recipe_unlocked"
+ },
+ "has_universal_redstone_component": {
+ "conditions": {
+ "items": [
+ {
+ "items": "anvilcraft_pigsplus:universal_redstone_component"
+ }
+ ]
+ },
+ "trigger": "minecraft:inventory_changed"
+ }
+ },
+ "requirements": [
+ [
+ "has_the_recipe",
+ "has_universal_redstone_component"
+ ]
+ ],
+ "rewards": {
+ "recipes": [
+ "anvilcraft_pigsplus:stonecutting/memory_block_comparator"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/redstone/stonecutting/observer.json b/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/redstone/stonecutting/observer.json
new file mode 100644
index 00000000..ae48d0b9
--- /dev/null
+++ b/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/redstone/stonecutting/observer.json
@@ -0,0 +1,32 @@
+{
+ "parent": "minecraft:recipes/root",
+ "criteria": {
+ "has_the_recipe": {
+ "conditions": {
+ "recipe": "anvilcraft_pigsplus:stonecutting/observer"
+ },
+ "trigger": "minecraft:recipe_unlocked"
+ },
+ "has_universal_redstone_component": {
+ "conditions": {
+ "items": [
+ {
+ "items": "anvilcraft_pigsplus:universal_redstone_component"
+ }
+ ]
+ },
+ "trigger": "minecraft:inventory_changed"
+ }
+ },
+ "requirements": [
+ [
+ "has_the_recipe",
+ "has_universal_redstone_component"
+ ]
+ ],
+ "rewards": {
+ "recipes": [
+ "anvilcraft_pigsplus:stonecutting/observer"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/redstone/stonecutting/redstone_conduit_block.json b/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/redstone/stonecutting/redstone_conduit_block.json
new file mode 100644
index 00000000..1cda3cee
--- /dev/null
+++ b/src/generated/resources/data/anvilcraft_pigsplus/advancement/recipes/redstone/stonecutting/redstone_conduit_block.json
@@ -0,0 +1,32 @@
+{
+ "parent": "minecraft:recipes/root",
+ "criteria": {
+ "has_the_recipe": {
+ "conditions": {
+ "recipe": "anvilcraft_pigsplus:stonecutting/redstone_conduit_block"
+ },
+ "trigger": "minecraft:recipe_unlocked"
+ },
+ "has_universal_redstone_component": {
+ "conditions": {
+ "items": [
+ {
+ "items": "anvilcraft_pigsplus:universal_redstone_component"
+ }
+ ]
+ },
+ "trigger": "minecraft:inventory_changed"
+ }
+ },
+ "requirements": [
+ [
+ "has_the_recipe",
+ "has_universal_redstone_component"
+ ]
+ ],
+ "rewards": {
+ "recipes": [
+ "anvilcraft_pigsplus:stonecutting/redstone_conduit_block"
+ ]
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/anvilcraft_pigsplus/loot_table/blocks/sculk_extractor.json b/src/generated/resources/data/anvilcraft_pigsplus/loot_table/blocks/memory_block_comparator.json
similarity index 68%
rename from src/generated/resources/data/anvilcraft_pigsplus/loot_table/blocks/sculk_extractor.json
rename to src/generated/resources/data/anvilcraft_pigsplus/loot_table/blocks/memory_block_comparator.json
index 7d3bcda1..7d9ecd93 100644
--- a/src/generated/resources/data/anvilcraft_pigsplus/loot_table/blocks/sculk_extractor.json
+++ b/src/generated/resources/data/anvilcraft_pigsplus/loot_table/blocks/memory_block_comparator.json
@@ -11,11 +11,11 @@
"entries": [
{
"type": "minecraft:item",
- "name": "anvilcraft_pigsplus:sculk_extractor"
+ "name": "anvilcraft_pigsplus:memory_block_comparator"
}
],
"rolls": 1.0
}
],
- "random_sequence": "anvilcraft_pigsplus:blocks/sculk_extractor"
+ "random_sequence": "anvilcraft_pigsplus:blocks/memory_block_comparator"
}
\ No newline at end of file
diff --git a/src/generated/resources/data/anvilcraft_pigsplus/recipe/memory_block_comparator.json b/src/generated/resources/data/anvilcraft_pigsplus/recipe/memory_block_comparator.json
new file mode 100644
index 00000000..3c4d7f5d
--- /dev/null
+++ b/src/generated/resources/data/anvilcraft_pigsplus/recipe/memory_block_comparator.json
@@ -0,0 +1,24 @@
+{
+ "type": "minecraft:crafting_shaped",
+ "category": "misc",
+ "key": {
+ "A": {
+ "item": "minecraft:observer"
+ },
+ "B": {
+ "item": "anvilcraft:processor"
+ },
+ "C": {
+ "item": "anvilcraft_pigsplus:karakuri_component"
+ }
+ },
+ "pattern": [
+ " ",
+ "ABC",
+ " "
+ ],
+ "result": {
+ "count": 1,
+ "id": "anvilcraft_pigsplus:memory_block_comparator"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/anvilcraft_pigsplus/recipe/sculk_extractor.json b/src/generated/resources/data/anvilcraft_pigsplus/recipe/sculk_extractor.json
deleted file mode 100644
index 32a9c774..00000000
--- a/src/generated/resources/data/anvilcraft_pigsplus/recipe/sculk_extractor.json
+++ /dev/null
@@ -1,24 +0,0 @@
-{
- "type": "minecraft:crafting_shaped",
- "category": "misc",
- "key": {
- "C": {
- "item": "anvilcraft_pigsplus:spiritual_component"
- },
- "L": {
- "item": "minecraft:echo_shard"
- },
- "S": {
- "item": "minecraft:sculk_catalyst"
- }
- },
- "pattern": [
- " S ",
- "LCL",
- "LCL"
- ],
- "result": {
- "count": 1,
- "id": "anvilcraft_pigsplus:sculk_extractor"
- }
-}
\ No newline at end of file
diff --git a/src/generated/resources/data/anvilcraft_pigsplus/recipe/stonecutting/memory_block_comparator.json b/src/generated/resources/data/anvilcraft_pigsplus/recipe/stonecutting/memory_block_comparator.json
new file mode 100644
index 00000000..055b16bb
--- /dev/null
+++ b/src/generated/resources/data/anvilcraft_pigsplus/recipe/stonecutting/memory_block_comparator.json
@@ -0,0 +1,10 @@
+{
+ "type": "minecraft:stonecutting",
+ "ingredient": {
+ "item": "anvilcraft_pigsplus:universal_redstone_component"
+ },
+ "result": {
+ "count": 1,
+ "id": "anvilcraft_pigsplus:memory_block_comparator"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/anvilcraft_pigsplus/recipe/stonecutting/observer.json b/src/generated/resources/data/anvilcraft_pigsplus/recipe/stonecutting/observer.json
new file mode 100644
index 00000000..5103c9d8
--- /dev/null
+++ b/src/generated/resources/data/anvilcraft_pigsplus/recipe/stonecutting/observer.json
@@ -0,0 +1,10 @@
+{
+ "type": "minecraft:stonecutting",
+ "ingredient": {
+ "item": "anvilcraft_pigsplus:universal_redstone_component"
+ },
+ "result": {
+ "count": 4,
+ "id": "minecraft:observer"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/anvilcraft_pigsplus/recipe/stonecutting/redstone_conduit_block.json b/src/generated/resources/data/anvilcraft_pigsplus/recipe/stonecutting/redstone_conduit_block.json
new file mode 100644
index 00000000..fbb76471
--- /dev/null
+++ b/src/generated/resources/data/anvilcraft_pigsplus/recipe/stonecutting/redstone_conduit_block.json
@@ -0,0 +1,10 @@
+{
+ "type": "minecraft:stonecutting",
+ "ingredient": {
+ "item": "anvilcraft_pigsplus:universal_redstone_component"
+ },
+ "result": {
+ "count": 64,
+ "id": "anvilcraft_pigsplus:redstone_conduit_block"
+ }
+}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/hoe.json b/src/generated/resources/data/minecraft/tags/block/mineable/hoe.json
index d4959b9b..f00f5878 100644
--- a/src/generated/resources/data/minecraft/tags/block/mineable/hoe.json
+++ b/src/generated/resources/data/minecraft/tags/block/mineable/hoe.json
@@ -1,6 +1,5 @@
{
"values": [
- "anvilcraft_pigsplus:sculk_extractor",
"anvilcraft_pigsplus:fake_menger_sponge"
]
}
\ No newline at end of file
diff --git a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json
index 009ce54a..a8f9b16c 100644
--- a/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json
+++ b/src/generated/resources/data/minecraft/tags/block/mineable/pickaxe.json
@@ -1,8 +1,10 @@
{
"values": [
"anvilcraft_pigsplus:void_acid_cauldron",
+ "anvilcraft_pigsplus:experience_interface",
"anvilcraft_pigsplus:auto_chicken",
"anvilcraft_pigsplus:redstone_conduit_block",
+ "anvilcraft_pigsplus:memory_block_comparator",
"anvilcraft_pigsplus:block_breaker",
"anvilcraft_pigsplus:precision_magnetic_pivot",
"anvilcraft_pigsplus:chain_smithing_table",
@@ -11,12 +13,11 @@
"anvilcraft_pigsplus:auto_royal_grindstone",
"anvilcraft_pigsplus:adjustable_power_converter",
"anvilcraft_pigsplus:chaotic_raw_ore_block",
+ "anvilcraft_pigsplus:void_catalyst",
"anvilcraft_pigsplus:deepslate_chaotic_ore",
"anvilcraft_pigsplus:enchanted_generator",
"anvilcraft_pigsplus:electric_enchanting_table",
"anvilcraft_pigsplus:echo_cluster",
- "anvilcraft_pigsplus:budding_echo_shard",
- "anvilcraft_pigsplus:void_catalyst",
- "anvilcraft_pigsplus:experience_interface"
+ "anvilcraft_pigsplus:budding_echo_shard"
]
}
\ No newline at end of file
diff --git a/src/main/java/dev/anvilcraft/pigsplus/api/RedstoneConduitLike.java b/src/main/java/dev/anvilcraft/pigsplus/api/RedstoneConduitLike.java
deleted file mode 100644
index 66ab701a..00000000
--- a/src/main/java/dev/anvilcraft/pigsplus/api/RedstoneConduitLike.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package dev.anvilcraft.pigsplus.api;
-
-public interface RedstoneConduitLike {
-}
diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/MemoryBlockComparatorBlock.java b/src/main/java/dev/anvilcraft/pigsplus/block/MemoryBlockComparatorBlock.java
new file mode 100644
index 00000000..fab761e5
--- /dev/null
+++ b/src/main/java/dev/anvilcraft/pigsplus/block/MemoryBlockComparatorBlock.java
@@ -0,0 +1,299 @@
+package dev.anvilcraft.pigsplus.block;
+
+import com.mojang.serialization.MapCodec;
+import dev.anvilcraft.lib.v2.piston.IMoveableEntityBlock;
+import dev.anvilcraft.lib.v2.util.ShapeUtil;
+import dev.anvilcraft.lib.v2.util.Util;
+import dev.anvilcraft.pigsplus.block.entity.MemoryBlockComparatorBlockEntity;
+import dev.anvilcraft.pigsplus.init.AddonBlockEntities;
+import dev.anvilcraft.pigsplus.util.StructureDiskUtil;
+import dev.dubhe.anvilcraft.api.hammer.IHammerRemovable;
+import dev.dubhe.anvilcraft.block.better.BetterBaseEntityBlock;
+import dev.dubhe.anvilcraft.init.item.ModComponents;
+import dev.dubhe.anvilcraft.init.item.ModItems;
+import dev.dubhe.anvilcraft.util.StructureLoadUtil;
+import net.minecraft.ChatFormatting;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.chat.Component;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.InteractionHand;
+import net.minecraft.world.InteractionResult;
+import net.minecraft.world.ItemInteractionResult;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.BaseEntityBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Mirror;
+import net.minecraft.world.level.block.RenderShape;
+import net.minecraft.world.level.block.Rotation;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.StateDefinition;
+import net.minecraft.world.level.block.state.properties.BlockStateProperties;
+import net.minecraft.world.level.block.state.properties.BooleanProperty;
+import net.minecraft.world.level.block.state.properties.DirectionProperty;
+import net.minecraft.world.level.pathfinder.PathComputationType;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.shapes.CollisionContext;
+import net.minecraft.world.phys.shapes.Shapes;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
+
+public class MemoryBlockComparatorBlock extends BetterBaseEntityBlock implements IHammerRemovable, IMoveableEntityBlock {
+ public static final DirectionProperty FACING = BlockStateProperties.FACING;
+ public static final BooleanProperty PRECISE = BooleanProperty.create("precise");
+ public static final BooleanProperty POWERED = BlockStateProperties.POWERED;
+
+ private static final VoxelShape BASE_SHAPE = Shapes.or(
+ Block.box(2, 0, 2, 14, 4, 14),
+ Block.box(5, 4, 5, 11, 10, 11),
+ Block.box(4, 10, 4, 12, 16, 12)
+ );
+
+ private static final VoxelShape SHAPE_DOWN = BASE_SHAPE;
+ private static final VoxelShape SHAPE_UP = ShapeUtil.rotate(Direction.Axis.X, 180, BASE_SHAPE);
+ private static final VoxelShape SHAPE_SOUTH = ShapeUtil.rotate(Direction.Axis.X, 90, BASE_SHAPE);
+ private static final VoxelShape SHAPE_NORTH = ShapeUtil.rotate(Direction.Axis.X, 270, BASE_SHAPE);
+ private static final VoxelShape SHAPE_EAST = ShapeUtil.rotate(Direction.Axis.Y, 270, SHAPE_NORTH);
+ private static final VoxelShape SHAPE_WEST = ShapeUtil.rotate(Direction.Axis.Y, 90, SHAPE_NORTH);
+
+ public MemoryBlockComparatorBlock(Properties properties) {
+ super(properties);
+ this.registerDefaultState(
+ this.stateDefinition
+ .any()
+ .setValue(FACING, Direction.DOWN)
+ .setValue(PRECISE, false)
+ .setValue(POWERED, false)
+ );
+ }
+
+ @Override
+ protected MapCodec codec() {
+ return simpleCodec(MemoryBlockComparatorBlock::new);
+ }
+
+ @Override
+ protected void createBlockStateDefinition(StateDefinition.Builder builder) {
+ builder.add(FACING).add(PRECISE).add(POWERED);
+ }
+
+ @Override
+ public VoxelShape getShape(
+ BlockState state,
+ BlockGetter level,
+ BlockPos pos,
+ CollisionContext context
+ ) {
+ return switch (state.getValue(FACING)) {
+ case DOWN -> SHAPE_DOWN;
+ case UP -> SHAPE_UP;
+ case NORTH -> SHAPE_NORTH;
+ case SOUTH -> SHAPE_SOUTH;
+ case EAST -> SHAPE_EAST;
+ case WEST -> SHAPE_WEST;
+ };
+ }
+
+ @Override
+ public RenderShape getRenderShape(BlockState state) {
+ return RenderShape.MODEL;
+ }
+
+ @Nullable
+ @Override
+ public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
+ return AddonBlockEntities.MEMORY_BLOCK_COMPARATOR.create(pos, state);
+ }
+
+ @Nullable
+ @Override
+ public BlockState getStateForPlacement(BlockPlaceContext context) {
+ Direction facing = context.getNearestLookingDirection();
+ if (context.getPlayer() != null && context.getPlayer().isShiftKeyDown()) {
+ facing = facing.getOpposite();
+ }
+ return defaultBlockState().setValue(FACING, facing);
+ }
+
+ @Override
+ protected void onPlace(BlockState state, Level level, BlockPos pos, BlockState oldState, boolean isMoving) {
+ if (level.isClientSide) return;
+ if (!oldState.is(state.getBlock()) && level.getBlockEntity(pos) instanceof MemoryBlockComparatorBlockEntity be) {
+ BlockState frontState = level.getBlockState(pos.relative(state.getValue(FACING)));
+ be.setRememberedState(frontState);
+ }
+ level.scheduleTick(pos, this, 1);
+ }
+
+ @Override
+ protected InteractionResult useWithoutItem(BlockState state, Level level, BlockPos pos, Player player, BlockHitResult hitResult) {
+ if (!player.getAbilities().mayBuild) {
+ return InteractionResult.PASS;
+ }
+ BlockState newState = state.cycle(PRECISE);
+ level.setBlock(pos, newState, Block.UPDATE_ALL);
+ this.updateNeighborsInFront(level, pos, state);
+ return InteractionResult.sidedSuccess(level.isClientSide);
+ }
+
+ @Override
+ protected ItemInteractionResult useItemOn(
+ ItemStack stack,
+ BlockState state,
+ Level level,
+ BlockPos pos,
+ Player player,
+ InteractionHand hand,
+ BlockHitResult hitResult
+ ) {
+ if (level.isClientSide) return ItemInteractionResult.SUCCESS;
+
+ if (player instanceof ServerPlayer serverPlayer) {
+ if (level.getBlockEntity(pos) instanceof MemoryBlockComparatorBlockEntity be) {
+ ItemStack held = serverPlayer.getItemInHand(hand);
+
+ // Regular disk handling (IDiskCloneable)
+ if (held.is(ModItems.DISK)) {
+ return Util.interactionResultConverter()
+ .apply(be.useDisk(level, serverPlayer, hand, held, hitResult));
+ }
+
+ // 结构磁盘处理
+ if (held.is(ModItems.STRUCTURE_DISK)) {
+ return handleStructureDisk(level, pos, state, serverPlayer, held, be, this);
+ }
+ }
+ }
+ return super.useItemOn(stack, state, level, pos, player, hand, hitResult);
+ }
+
+ @Override
+ protected void neighborChanged(
+ BlockState state,
+ Level level,
+ BlockPos pos,
+ Block neighborBlock,
+ BlockPos neighborPos,
+ boolean movedByPiston
+ ) {
+ if (!level.isClientSide && neighborPos.equals(pos.relative(state.getValue(FACING)))) {
+ if (!level.getBlockTicks().hasScheduledTick(pos, this)) {
+ level.scheduleTick(pos, this, 2);
+ }
+ }
+ }
+
+ @Override
+ protected void tick(BlockState state, ServerLevel level, BlockPos pos, RandomSource random) {
+ boolean matches = checkMatch(level, pos, state);
+ if (matches != state.getValue(POWERED)) {
+ level.setBlock(pos, state.setValue(POWERED, matches), Block.UPDATE_ALL);
+ this.updateNeighborsInFront(level, pos, state);
+ }
+ }
+
+ private boolean checkMatch(Level level, BlockPos pos, BlockState state) {
+ if (!(level.getBlockEntity(pos) instanceof MemoryBlockComparatorBlockEntity be)) {
+ return false;
+ }
+ Direction facing = state.getValue(FACING);
+ BlockState current = level.getBlockState(pos.relative(facing));
+ BlockState remembered = be.getRememberedState();
+ return state.getValue(PRECISE)
+ ? current.equals(remembered)
+ : current.is(remembered.getBlock());
+ }
+
+ /**
+ * 处理结构磁盘与记忆方块比较器的交互。
+ * 若磁盘已有数据则加载，否则保存为 1x1x1 结构。
+ */
+ protected static ItemInteractionResult handleStructureDisk(
+ Level level,
+ BlockPos pos,
+ BlockState state,
+ ServerPlayer serverPlayer,
+ ItemStack held,
+ MemoryBlockComparatorBlockEntity be,
+ Block block
+ ) {
+ // 磁盘已有数据 → 加载结构
+ if (held.has(ModComponents.STRUCTURE_DISK_DATA)) {
+ StructureLoadUtil.StructureData structureData = StructureLoadUtil.loadStructureFromDisk(level, held);
+ if (structureData == null || structureData.blocks.isEmpty()) {
+ return ItemInteractionResult.FAIL;
+ }
+ if (structureData.blocks.size() > 1) {
+ serverPlayer.displayClientMessage(
+ Component.translatable("block.anvilcraft_pigsplus.memory_block_comparator.structure_too_large")
+ .withStyle(ChatFormatting.RED),
+ true
+ );
+ return ItemInteractionResult.SUCCESS;
+ }
+ // 单个方块，直接应用
+ be.setRememberedState(structureData.blocks.getFirst().state());
+ level.scheduleTick(pos, block, 2);
+ return ItemInteractionResult.SUCCESS;
+ } else {
+ // 空磁盘 → 将记忆的方块状态保存为 1x1x1 结构
+ BlockState remembered = be.getRememberedState();
+
+ CompoundTag tag = StructureDiskUtil.getCompoundTag(remembered);
+
+ return StructureDiskUtil.saveData(level, state.getValue(MemoryBlockComparatorBlock.FACING), held, tag)
+ ? ItemInteractionResult.SUCCESS
+ : ItemInteractionResult.FAIL;
+ }
+ }
+
+ protected void updateNeighborsInFront(Level level, BlockPos pos, BlockState state) {
+ Direction outputDirection = state.getValue(FACING).getOpposite();
+ BlockPos blockPos = pos.relative(outputDirection);
+ level.neighborChanged(blockPos, this, pos);
+ level.updateNeighborsAtExceptFromFacing(blockPos, this, outputDirection);
+ }
+
+ @Override
+ public boolean canConnectRedstone(BlockState state, BlockGetter level, BlockPos pos, @Nullable Direction direction) {
+ return direction != (state.getValue(FACING).getOpposite());
+ }
+
+ @Override
+ protected boolean isSignalSource(BlockState state) {
+ return true;
+ }
+
+ @Override
+ protected int getDirectSignal(BlockState blockState, BlockGetter blockAccess, BlockPos pos, Direction side) {
+ return blockState.getSignal(blockAccess, pos, side);
+ }
+
+ @Override
+ protected int getSignal(BlockState blockState, BlockGetter blockAccess, BlockPos pos, Direction side) {
+ return blockState.getValue(POWERED) && blockState.getValue(FACING).getOpposite() != side ? 15 : 0;
+ }
+
+ @Override
+ protected boolean isPathfindable(BlockState state, PathComputationType pathComputationType) {
+ return false;
+ }
+
+ @Override
+ protected BlockState rotate(BlockState state, Rotation rotation) {
+ return state.setValue(FACING, rotation.rotate(state.getValue(FACING)));
+ }
+
+ @Override
+ protected BlockState mirror(BlockState state, Mirror mirror) {
+ return state.setValue(FACING, mirror.mirror(state.getValue(FACING)));
+ }
+}
diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/RedstoneConduitBlock.java b/src/main/java/dev/anvilcraft/pigsplus/block/RedstoneConduitBlock.java
index f3489763..f9008999 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/block/RedstoneConduitBlock.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/block/RedstoneConduitBlock.java
@@ -1,22 +1,24 @@
package dev.anvilcraft.pigsplus.block;
-import dev.anvilcraft.pigsplus.api.RedstoneConduitLike;
+import dev.anvilcraft.pigsplus.init.AddonBlocks;
import dev.dubhe.anvilcraft.api.hammer.IHammerRemovable;
+import dev.dubhe.anvilcraft.init.block.ModBlocks;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.util.Mth;
import net.minecraft.world.level.BlockGetter;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.RedStoneWireBlock;
+import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.block.state.StateDefinition;
import net.minecraft.world.level.block.state.properties.BlockStateProperties;
import net.minecraft.world.level.block.state.properties.IntegerProperty;
import net.minecraft.world.level.redstone.Redstone;
-public class RedstoneConduitBlock extends Block implements IHammerRemovable, RedstoneConduitLike {
+public class RedstoneConduitBlock extends Block implements IHammerRemovable {
public static final IntegerProperty POWER = BlockStateProperties.POWER;
+ private boolean shouldSignal = true;
public RedstoneConduitBlock(Properties properties) {
super(properties);
@@ -30,41 +32,57 @@ protected void createBlockStateDefinition(StateDefinition.Builder= Redstone.SIGNAL_MAX) {
- break;
- }
+ private void updatePower(Level level, BlockPos pos) {
+ if (level.isClientSide) return;
+
+ // 计算期间临时关闭信号输出，防止自我反馈
+ this.shouldSignal = false;
+
+ int pow = 0;
+ for (Direction direction : Direction.values()) {
+ BlockPos neighborPos = pos.relative(direction);
+ BlockState neighborState = level.getBlockState(neighborPos);
+
+ int signal;
+ if (neighborState.is(AddonBlocks.REDSTONE_CONDUIT_BLOCK)) {
+ signal = neighborState.getValue(POWER) - 1;
+ } else if (neighborState.is(Blocks.REDSTONE_WIRE)) {
+ signal = level.getSignal(neighborPos, direction) - 1;
+ } else if (neighborState.is(ModBlocks.REDSTONE_WIRE)) {
+ signal = level.getSignal(neighborPos, direction) - 1;
+ } else {
+ signal = level.getSignal(neighborPos, direction);
}
- level.setBlock(pos, state.setValue(POWER, Mth.clamp(pow, 0, 15)), 1 | 2 | 4);
+
+ pow = Math.max(pow, signal);
+ if (pow >= Redstone.SIGNAL_MAX) break;
+ }
+
+ this.shouldSignal = true;
+
+ int clamped = Mth.clamp(pow, Redstone.SIGNAL_MIN, Redstone.SIGNAL_MAX);
+ BlockState state = level.getBlockState(pos);
+ if (state.getValue(POWER) != clamped) {
+ level.setBlock(pos, state.setValue(POWER, clamped), Block.UPDATE_ALL);
}
}
@Override
public boolean isSignalSource(BlockState state) {
- return true;
+ return this.shouldSignal;
}
@Override
public int getSignal(BlockState blockState, BlockGetter blockAccess, BlockPos pos, Direction side) {
- return Math.max(0, blockState.getValue(POWER));
+ return !this.shouldSignal ? 0 : blockState.getValue(POWER);
}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/SculkExtractorBlock.java b/src/main/java/dev/anvilcraft/pigsplus/block/SculkExtractorBlock.java
deleted file mode 100644
index 316f4af5..00000000
--- a/src/main/java/dev/anvilcraft/pigsplus/block/SculkExtractorBlock.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package dev.anvilcraft.pigsplus.block;
-
-import com.mojang.serialization.MapCodec;
-import dev.anvilcraft.pigsplus.block.entity.SculkExtractorBlockEntity;
-import dev.anvilcraft.pigsplus.init.AddonBlockEntities;
-import dev.dubhe.anvilcraft.api.hammer.IHammerRemovable;
-import dev.dubhe.anvilcraft.block.better.BetterBaseEntityBlock;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.BaseEntityBlock;
-import net.minecraft.world.level.block.RenderShape;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityTicker;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import org.jetbrains.annotations.Nullable;
-
-public class SculkExtractorBlock extends BetterBaseEntityBlock implements IHammerRemovable {
- public SculkExtractorBlock(Properties properties) {
- super(properties);
- }
-
- @Override
- public BlockEntity newBlockEntity(BlockPos pos, BlockState state) {
- return new SculkExtractorBlockEntity(AddonBlockEntities.SCULK_EXTRACTOR.get(),pos, state);
- }
-
- @Override
- protected MapCodec codec() {
- return simpleCodec(AutoRoyalSmithingTableBlock::new);
- }
-
- @Override
- public @Nullable BlockEntityTicker getTicker(Level level, BlockState state, BlockEntityType type) {
- if (level.isClientSide) {
- return null;
- }
- return createTickerHelper(
- type, AddonBlockEntities.SCULK_EXTRACTOR.get(),
- (level1, pos, state1, blockEntity) -> blockEntity.tick()
- );
- }
-
- @Override
- public RenderShape getRenderShape(BlockState state) {
- return RenderShape.MODEL;
- }
-}
\ No newline at end of file
diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java
index 76ebd722..f9073f6d 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/block/entity/ElectricEnchantingTableBlockEntity.java
@@ -1,9 +1,10 @@
package dev.anvilcraft.pigsplus.block.entity;
import dev.anvilcraft.pigsplus.block.ElectricEnchantingTableBlock;
-import dev.anvilcraft.pigsplus.init.AddonParticleTypes;
import dev.anvilcraft.pigsplus.util.ChiseledBookShelfUtil;
import dev.anvilcraft.pigsplus.util.ExpUtil;
+import dev.anvilcraft.pigsplus.util.FluidUtil;
+import dev.anvilcraft.pigsplus.util.ParticleUtil;
import dev.dubhe.anvilcraft.AnvilCraft;
import dev.dubhe.anvilcraft.api.IHasDisplayItem;
import dev.dubhe.anvilcraft.api.itemhandler.FilteredItemStackHandler;
@@ -11,7 +12,7 @@
import dev.dubhe.anvilcraft.api.power.IPowerConsumer;
import dev.dubhe.anvilcraft.api.power.PowerGrid;
import dev.dubhe.anvilcraft.block.entity.IFilterBlockEntity;
-import dev.dubhe.anvilcraft.init.block.ModFluids;
+import dev.dubhe.anvilcraft.init.block.ModFluidTags;
import dev.dubhe.anvilcraft.network.UpdateDisplayItemPacket;
import it.unimi.dsi.fastutil.objects.Object2IntMap;
import lombok.Getter;
@@ -47,7 +48,6 @@
public class ElectricEnchantingTableBlockEntity extends BlockEntity
implements IPowerConsumer, IFilterBlockEntity, IItemHandlerHolder, IHasDisplayItem {
- public static final double PARTICLE_SPEED = 0.06;
public Map, Integer> enchantments = new HashMap<>();
@Getter
private int needXpLiquid = 0;
@@ -176,20 +176,10 @@ protected void absorbXP(ServerLevel level) {
int onceNeedXpLiquid = this.needXpLiquid - this.absorbedXpLiquid;
onceNeedXpLiquid = Math.clamp(onceNeedXpLiquid, 0, CONFIG.electricEnchantingTable.fluidComsumeSpeed);
- FluidStack accepted = handler.drain(new FluidStack(ModFluids.EXP_FLUID, onceNeedXpLiquid), IFluidHandler.FluidAction.EXECUTE);
+ FluidStack accepted = FluidUtil.drain(handler, ModFluidTags.EXPERIENCE, onceNeedXpLiquid, IFluidHandler.FluidAction.EXECUTE);
if (accepted.getAmount() > 0) {
- level.sendParticles(
- AddonParticleTypes.EXP.get(),
- (double) blockPos1.getX() + (double) 0.5F,
- (double) blockPos1.getY() + (double) 0.5F,
- (double) blockPos1.getZ() + (double) 0.5F,
- 0,
- blockPos.getX() * -PARTICLE_SPEED * (level.getRandom().nextFloat() * 0.2 + 0.9),
- blockPos.getY() * -PARTICLE_SPEED * (level.getRandom().nextFloat() * 0.2 + 0.9),
- blockPos.getZ() * -PARTICLE_SPEED * (level.getRandom().nextFloat() * 0.2 + 0.9),
- 1.0
- );
+ ParticleUtil.sendParticle(level, blockPos1, this.getBlockPos());
this.absorbedXpLiquid += accepted.getAmount();
}
diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/ExperienceInterfaceBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/ExperienceInterfaceBlockEntity.java
index 23768bee..26b5bf68 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/block/entity/ExperienceInterfaceBlockEntity.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/block/entity/ExperienceInterfaceBlockEntity.java
@@ -3,7 +3,9 @@
import dev.anvilcraft.pigsplus.block.ExperienceInterfaceBlock;
import dev.anvilcraft.pigsplus.inventory.ExperienceInterfaceMenu;
import dev.anvilcraft.pigsplus.util.ExpUtil;
-import dev.dubhe.anvilcraft.init.block.ModFluids;
+import dev.anvilcraft.pigsplus.util.FluidUtil;
+import dev.anvilcraft.pigsplus.util.ParticleUtil;
+import dev.dubhe.anvilcraft.init.block.ModFluidTags;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.HolderLookup;
@@ -26,10 +28,11 @@
import java.util.List;
+import static dev.anvilcraft.pigsplus.AnvilCraftPigsPlus.CONFIG;
+
public class ExperienceInterfaceBlockEntity extends BlockEntity implements MenuProvider {
private static final int SEARCH_RADIUS = 2;
- private static final int SCAN_COOLDOWN = 20;
- public static final int XP_PER_TIME = 100;
+ private static final int SCAN_COOLDOWN = 40;
private int xp_target = 30;
private int cooldown = 0;
@@ -63,7 +66,7 @@ public void setXpTarget(int xpTarget) {
}
public void tick(Level level) {
- if (!(level instanceof ServerLevel)) return;
+ if (!(level instanceof ServerLevel level1)) return;
if (working) {
cooldown = 1;
@@ -82,45 +85,53 @@ public void tick(Level level) {
if (!player.isRemoved() && !player.isSpectator()) {
int playerLevel = player.experienceLevel;
if (playerLevel >= xp_target) {
- absorbPlayerExperience(player, getHandler());
+ absorbPlayerExperience(player, getHandler(), level1);
} else {
- releaseExperienceToPlayer(player, getHandler());
+ releaseExperienceToPlayer(player, getHandler(), level1);
}
}
}
}
- private void absorbPlayerExperience(Player player, IFluidHandler handler) {
- int totalExp;
- if (player.experienceLevel > xp_target) {
- totalExp = XP_PER_TIME;
- } else {
- totalExp = Math.min(XP_PER_TIME, (int) (player.experienceProgress * player.getXpNeededForNextLevel()));
- }
-
+ private void absorbPlayerExperience(Player player, IFluidHandler handler, ServerLevel level1) {
+ int totalExp = ExpUtil.getPlayerXp(player) - ExpUtil.getXpfromAllLevel(xp_target);
if (totalExp <= 0) return;
+
int liquidExp = ExpUtil.getFLuidFromXp(totalExp);
- int accepted = handler.fill(new FluidStack(ModFluids.EXP_FLUID, liquidExp), IFluidHandler.FluidAction.SIMULATE);
+ int accepted = FluidUtil.fill(handler, ModFluidTags.EXPERIENCE, liquidExp, IFluidHandler.FluidAction.SIMULATE);
+ if (accepted <= 0) return;
liquidExp = ExpUtil.XpRound(accepted); // 确保只接受完整的经验单位
- handler.fill(new FluidStack(ModFluids.EXP_FLUID, liquidExp), IFluidHandler.FluidAction.EXECUTE);
+ if (liquidExp <= 0) return;
+ FluidUtil.fill(handler, ModFluidTags.EXPERIENCE, liquidExp, IFluidHandler.FluidAction.EXECUTE);
player.giveExperiencePoints(-ExpUtil.getXpFromFluid(liquidExp));
- }
- private void releaseExperienceToPlayer(Player player, IFluidHandler handler) {
+ int particleNum = Math.max(20, liquidExp / CONFIG.electricEnchantingTable.fluidComsumeSpeed);
+ for (int i = 0; i < particleNum; i++) {
+ ParticleUtil.sendParticle(level1, player.getPosition(0), this.getBlockPos().getCenter());
+ }
+ }
- int liquidExp = ExpUtil.getFLuidFromXp(XP_PER_TIME);
- FluidStack accepted = handler.drain(new FluidStack(ModFluids.EXP_FLUID, liquidExp), IFluidHandler.FluidAction.SIMULATE);
+ private void releaseExperienceToPlayer(Player player, IFluidHandler handler, ServerLevel level1) {
+ int totalExp = ExpUtil.getXpfromAllLevel(xp_target) - ExpUtil.getPlayerXp(player);
+ if (totalExp <= 0) return;
- if (accepted.getAmount() <= 0) return;
+ int liquidExp = ExpUtil.getFLuidFromXp(totalExp);
+ FluidStack accepted = FluidUtil.drain(handler, ModFluidTags.EXPERIENCE, liquidExp, IFluidHandler.FluidAction.SIMULATE);
+ if (accepted.isEmpty()) return;
liquidExp = ExpUtil.XpRound(accepted.getAmount()); // 确保只接受完整的经验单位
+ if (liquidExp <= 0) return;
- handler.drain(new FluidStack(ModFluids.EXP_FLUID, liquidExp), IFluidHandler.FluidAction.EXECUTE);
-
+ FluidUtil.drain(handler, ModFluidTags.EXPERIENCE, liquidExp, IFluidHandler.FluidAction.EXECUTE);
player.giveExperiencePoints(ExpUtil.getXpFromFluid(liquidExp));
+
+ int particleNum = Math.max(20, liquidExp / CONFIG.electricEnchantingTable.fluidComsumeSpeed);
+ for (int i = 0; i < particleNum; i++) {
+ ParticleUtil.sendParticle(level1, this.getBlockPos().getCenter(), player.getPosition(0));
+ }
}
@Override
diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/MemoryBlockComparatorBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/MemoryBlockComparatorBlockEntity.java
new file mode 100644
index 00000000..7533d696
--- /dev/null
+++ b/src/main/java/dev/anvilcraft/pigsplus/block/entity/MemoryBlockComparatorBlockEntity.java
@@ -0,0 +1,64 @@
+package dev.anvilcraft.pigsplus.block.entity;
+
+import dev.dubhe.anvilcraft.api.item.IDiskCloneable;
+import lombok.Getter;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.HolderLookup;
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class MemoryBlockComparatorBlockEntity extends BlockEntity implements IDiskCloneable {
+ @Getter
+ private BlockState rememberedState = Blocks.AIR.defaultBlockState();
+
+ public MemoryBlockComparatorBlockEntity(BlockEntityType type, BlockPos pos, BlockState blockState) {
+ super(type, pos, blockState);
+ }
+
+ public void setRememberedState(BlockState state) {
+ this.rememberedState = state;
+ setChanged();
+ }
+
+ @Override
+ protected void saveAdditional(CompoundTag tag, HolderLookup.Provider registries) {
+ super.saveAdditional(tag, registries);
+ tag.put("remembered_state", NbtUtils.writeBlockState(this.rememberedState));
+ }
+
+ @Override
+ protected void loadAdditional(CompoundTag tag, HolderLookup.Provider registries) {
+ super.loadAdditional(tag, registries);
+ if (tag.contains("remembered_state")) {
+ this.rememberedState = NbtUtils.readBlockState(
+ registries.lookupOrThrow(Registries.BLOCK),
+ tag.getCompound("remembered_state")
+ );
+ }
+ }
+
+ @Override
+ public void storeDiskData(CompoundTag tag) {
+ tag.put("remembered_state", NbtUtils.writeBlockState(this.rememberedState));
+ }
+
+ @Override
+ public void applyDiskData(CompoundTag tag) {
+ if (tag.contains("remembered_state")) {
+ this.rememberedState = NbtUtils.readBlockState(
+ BuiltInRegistries.BLOCK.asLookup(),
+ tag.getCompound("remembered_state")
+ );
+ }
+ setChanged();
+ if (level != null && !level.isClientSide) {
+ level.scheduleTick(this.getBlockPos(), this.getBlockState().getBlock(), 2);
+ }
+ }
+}
diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/PecisionMagneticPivotBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/PecisionMagneticPivotBlockEntity.java
index e1e3cfb5..5be38fbe 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/block/entity/PecisionMagneticPivotBlockEntity.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/block/entity/PecisionMagneticPivotBlockEntity.java
@@ -80,8 +80,6 @@ public void onAdjacentMagnetPushed(Direction sourceDirection, Direction pushDire
preDirection = pushDirection;
setChanged();
- ChargeCollectorManager.charge(Math.pow(2, frictionCount), level, this.getBlockPos());
-
if (frictionCount == 4) {
ChargeCollectorManager.charge(64, level, this.getBlockPos());
frictionCount = 0;
diff --git a/src/main/java/dev/anvilcraft/pigsplus/block/entity/SculkExtractorBlockEntity.java b/src/main/java/dev/anvilcraft/pigsplus/block/entity/SculkExtractorBlockEntity.java
deleted file mode 100644
index c810a69a..00000000
--- a/src/main/java/dev/anvilcraft/pigsplus/block/entity/SculkExtractorBlockEntity.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package dev.anvilcraft.pigsplus.block.entity;
-
-import dev.anvilcraft.pigsplus.init.AddonBlocks;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.core.HolderLookup;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.entity.ExperienceOrb;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.Vec3;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-public class SculkExtractorBlockEntity extends BlockEntity {
- private int cooldown = 0;
- private static final int SCAN_COOLDOWN = 100;
-
- public SculkExtractorBlockEntity(BlockEntityType type, BlockPos pos, BlockState blockState) {
- super(type, pos, blockState);
- }
-
- @Override
- protected void loadAdditional(CompoundTag tag, HolderLookup.Provider provider) {
- super.loadAdditional(tag, provider);
- cooldown = tag.getInt("Cooldown");
- }
-
- @Override
- protected void saveAdditional(CompoundTag tag, HolderLookup.Provider provider) {
- super.saveAdditional(tag, provider);
- tag.putInt("Cooldown", cooldown);
- }
-
- public void tick() {
- if (level == null || level.isClientSide()) return;
- if (cooldown-- > 0) return;
- cooldown = SCAN_COOLDOWN;
-
- // 计算周围的幽匿类方块数量
- AtomicInteger sculkValue = new AtomicInteger();
- BlockPos.breadthFirstTraversal(
- getBlockPos(), 8, (int) Math.pow(2, 10),
- (blockPos, consumer) -> {
- for (Direction direction : Direction.values()) {
- consumer.accept(blockPos.relative(direction));
- }
- },
- blockPos -> {
- BlockState state = level.getBlockState(blockPos);
- if (state.is(Blocks.SCULK) ||
- state.is(Blocks.SCULK_VEIN) ||
- state.is(Blocks.SCULK_CATALYST) ||
- state.is(Blocks.SCULK_SHRIEKER) ||
- state.is(Blocks.SCULK_SENSOR)) {
- level.setBlockAndUpdate(blockPos, Blocks.AIR.defaultBlockState());
- sculkValue.getAndIncrement();
- return true;
- } else if (
- state.is(AddonBlocks.ECHO_CLUSTER)) {
- level.setBlockAndUpdate(blockPos, Blocks.AIR.defaultBlockState());
- sculkValue.getAndAdd(50);
- return true;
- } else if (state.is(AddonBlocks.BUDDING_ECHO_SHARD) ||
- state.is(AddonBlocks.SCULK_EXTRACTOR)) {
- return true;
- } else {
- return false;
- }
- }
- );
-
- // 根据周围的幽匿方块数量确定经验球的数量
- int experienceAmount = Math.max(0, 10 * sculkValue.get());
- if (experienceAmount == 0) return;
- Vec3 spawnPos = Vec3.atCenterOf(getBlockPos()).add(0, 1, 0);
- ExperienceOrb.award((ServerLevel) level, spawnPos, experienceAmount);
- }
-}
\ No newline at end of file
diff --git a/src/main/java/dev/anvilcraft/pigsplus/config/AddonServerConfig.java b/src/main/java/dev/anvilcraft/pigsplus/config/AddonServerConfig.java
index a1864056..489eeacc 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/config/AddonServerConfig.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/config/AddonServerConfig.java
@@ -19,6 +19,10 @@ public class AddonServerConfig {
@BoundedDiscrete(min = 1, max = 1024000)
public int portableWirelessChargerEnergyConversion = 16;
+ // 虚空酸
+ @Comment("Allow the Void Acid to destroy blocks")
+ public boolean voidAcidDestroy = true;
+
// 电力附魔台
@CollapsibleObject
public ElectricEnchantingTable electricEnchantingTable = new ElectricEnchantingTable();
diff --git a/src/main/java/dev/anvilcraft/pigsplus/data/lang/LangHandler.java b/src/main/java/dev/anvilcraft/pigsplus/data/lang/LangHandler.java
index 4274fa91..98d4f5fc 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/data/lang/LangHandler.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/data/lang/LangHandler.java
@@ -19,6 +19,11 @@ public static void init(RegistrumLangProvider provider) {
"Too close to another enchanted generator"
);
+ provider.add(
+ "block.anvilcraft_pigsplus.memory_block_comparator.structure_too_large",
+ "Saved structure is larger than 1x1x1, cannot load into memory block comparator"
+ );
+
provider.add("tooltip.anvilcraft_pigsplus.enchanted_generator.decrease_rate", "XP decrease rate: %s");
provider.add("tooltip.anvilcraft_pigsplus.menger_sponge_staff", "Remove a large amount of liquid");
provider.add("tooltip.anvilcraft_pigsplus.precision_magnetic_pivot.time", "Status: %s");
diff --git a/src/main/java/dev/anvilcraft/pigsplus/data/recipe/VanillaRecipesLoader.java b/src/main/java/dev/anvilcraft/pigsplus/data/recipe/VanillaRecipesLoader.java
index 8676fd1e..57df654c 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/data/recipe/VanillaRecipesLoader.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/data/recipe/VanillaRecipesLoader.java
@@ -2,6 +2,7 @@
import dev.anvilcraft.lib.v2.registrum.providers.RegistrumRecipeProvider;
import dev.anvilcraft.pigsplus.AnvilCraftPigsPlus;
+import dev.anvilcraft.pigsplus.init.AddonBlocks;
import dev.anvilcraft.pigsplus.init.AddonItems;
import dev.dubhe.anvilcraft.data.AnvilCraftDatagen;
import dev.dubhe.anvilcraft.init.block.ModBlocks;
@@ -25,6 +26,8 @@ public static void init(RegistrumRecipeProvider provider) {
.unlockedBy("hasitem", AnvilCraftDatagen.has(AddonItems.KARAKURI_COMPONENT))
.save(provider, AnvilCraftPigsPlus.of("circuit_board"));
+ cuttingUniversalRedstoneComponent(provider, AddonBlocks.MEMORY_BLOCK_COMPARATOR, 1);
+ cuttingUniversalRedstoneComponent(provider, AddonBlocks.REDSTONE_CONDUIT_BLOCK, 64);
cuttingUniversalRedstoneComponent(provider, ModBlocks.PULSE_GENERATOR, 1);
cuttingUniversalRedstoneComponent(provider, ModBlocks.ADVANCED_COMPARATOR, 1);
cuttingUniversalRedstoneComponent(provider, ModBlocks.BLOCK_COMPARATOR, 1);
@@ -34,6 +37,7 @@ public static void init(RegistrumRecipeProvider provider) {
cuttingUniversalRedstoneComponent(provider, Items.COMPARATOR, 3);
cuttingUniversalRedstoneComponent(provider, Items.LEVER, 8);
cuttingUniversalRedstoneComponent(provider, Items.TRIPWIRE_HOOK, 4);
+ cuttingUniversalRedstoneComponent(provider, Items.OBSERVER, 4);
}
diff --git a/src/main/java/dev/anvilcraft/pigsplus/fluid/VoidAcidFluid.java b/src/main/java/dev/anvilcraft/pigsplus/fluid/VoidAcidFluid.java
index 6b5e15dd..c7547717 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/fluid/VoidAcidFluid.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/fluid/VoidAcidFluid.java
@@ -13,26 +13,34 @@
import net.minecraft.world.level.material.FluidState;
import net.neoforged.neoforge.fluids.BaseFlowingFluid;
+import static dev.anvilcraft.pigsplus.AnvilCraftPigsPlus.CONFIG;
+
public abstract class VoidAcidFluid extends BaseFlowingFluid {
protected VoidAcidFluid(Properties properties) {
super(properties);
}
+ @Override
+ protected boolean isRandomlyTicking() {
+ return true;
+ }
+
@Override
public void randomTick(Level level, BlockPos pos, FluidState state, RandomSource random) {
- // TODO: 不知道为什么不触发
super.randomTick(level, pos, state, random);
+ if (level.isClientSide()) return;
+ if (!CONFIG.voidAcidDestroy) return;
+
for (Direction direction : Direction.values()) {
BlockPos targetPos = pos.relative(direction);
BlockState targetState = level.getBlockState(targetPos);
if (targetState.is(AddonBlockTags.VOID_ACID_IMMUNE)) continue;
-
float hardness = targetState.getDestroySpeed(level, targetPos);
if (hardness <= 0.0f) continue;
- float probability = 5f / (hardness + 10.0f);
+ float probability = 1f / (hardness + 2.0f);
if (random.nextFloat() < probability) {
level.destroyBlock(targetPos, false);
if (random.nextFloat() < 0.1f) {
diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java
index aa00c6cd..22781cf2 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlockEntities.java
@@ -8,8 +8,8 @@
import dev.anvilcraft.pigsplus.block.entity.ElectricEnchantingTableBlockEntity;
import dev.anvilcraft.pigsplus.block.entity.EnchantedGeneratorBlockEntity;
import dev.anvilcraft.pigsplus.block.entity.ExperienceInterfaceBlockEntity;
+import dev.anvilcraft.pigsplus.block.entity.MemoryBlockComparatorBlockEntity;
import dev.anvilcraft.pigsplus.block.entity.PecisionMagneticPivotBlockEntity;
-import dev.anvilcraft.pigsplus.block.entity.SculkExtractorBlockEntity;
import dev.anvilcraft.pigsplus.client.renderer.blockentity.AdjustablePowerConverterRenderer;
import dev.anvilcraft.pigsplus.client.renderer.blockentity.ElectricEnchantingTableRenderer;
import dev.anvilcraft.pigsplus.client.renderer.blockentity.EnchantedGeneratorRenderer;
@@ -44,10 +44,6 @@ public class AddonBlockEntities {
.renderer(() -> ElectricEnchantingTableRenderer::new)
.register();
- public static final BlockEntityEntry SCULK_EXTRACTOR =
- REGISTRATE.blockEntity("sculk_extractor", SculkExtractorBlockEntity::new)
- .validBlock(AddonBlocks.SCULK_EXTRACTOR)
- .register();
public static final BlockEntityEntry ADJUSTABLE_POWER_CONVERTER =
REGISTRATE.blockEntity("adjustable_power_converter", AdjustablePowerConverterBlockEntity::new)
@@ -65,6 +61,11 @@ public class AddonBlockEntities {
.validBlock(AddonBlocks.PRECISION_MAGNETIC_PIVOT)
.register();
+ public static final BlockEntityEntry MEMORY_BLOCK_COMPARATOR =
+ REGISTRATE.blockEntity("memory_block_comparator", MemoryBlockComparatorBlockEntity::new)
+ .validBlock(AddonBlocks.MEMORY_BLOCK_COMPARATOR)
+ .register();
+
public static void register() {
}
}
\ No newline at end of file
diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java
index fe23300c..5529feaa 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonBlocks.java
@@ -14,10 +14,10 @@
import dev.anvilcraft.pigsplus.block.EnchantedGeneratorBlock;
import dev.anvilcraft.pigsplus.block.ExperienceInterfaceBlock;
import dev.anvilcraft.pigsplus.block.FakeMengerSpongeBlock;
+import dev.anvilcraft.pigsplus.block.MemoryBlockComparatorBlock;
import dev.anvilcraft.pigsplus.block.PecisionMagneticPivotBlock;
import dev.anvilcraft.pigsplus.block.PigAnvilBlock;
import dev.anvilcraft.pigsplus.block.RedstoneConduitBlock;
-import dev.anvilcraft.pigsplus.block.SculkExtractorBlock;
import dev.anvilcraft.pigsplus.block.VoidAcidCauldronBlock;
import dev.anvilcraft.pigsplus.block.VoidCatalystBlock;
import dev.anvilcraft.pigsplus.block.WeakResinBlock;
@@ -113,6 +113,26 @@ public class AddonBlocks {
.save(provider))
.register();
+ public static final BlockEntry EXPERIENCE_INTERFACE = REGISTRATE
+ .block("experience_interface", ExperienceInterfaceBlock::new)
+ .lang("Experience Interface")
+ .initialProperties(() -> Blocks.IRON_BLOCK)
+ .properties(p -> p.noOcclusion().isValidSpawn(Blocks::never))
+ .blockstate(DataGenUtil::noExtraModelOrState)
+ .simpleItem()
+ .tag(BlockTags.MINEABLE_WITH_PICKAXE)
+ .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get())
+ .pattern(" ")
+ .pattern(" E ")
+ .pattern("ABA")
+ .define('A', AddonItems.KARAKURI_COMPONENT)
+ .define('B', ModItemTags.BRASS_INGOTS)
+ .define('E', ModItems.EXP_GEM)
+ .unlockedBy(AnvilCraftDatagen.hasItem(AddonItems.KARAKURI_COMPONENT), AnvilCraftDatagen.has(AddonItems.KARAKURI_COMPONENT))
+ .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.EXP_GEM), AnvilCraftDatagen.has(ModItems.EXP_GEM))
+ .save(provider))
+ .register();
+
public static final BlockEntry AUTO_CHICKEN = REGISTRATE
.block("auto_chicken", AutoChickenBlock::new)
.lang("Auto Chicken")
@@ -142,6 +162,25 @@ public class AddonBlocks {
.save(provider))
.register();
+ public static final BlockEntry MEMORY_BLOCK_COMPARATOR = REGISTRATE
+ .block("memory_block_comparator", MemoryBlockComparatorBlock::new)
+ .lang("Memory Block Comparator")
+ .initialProperties(() -> Blocks.OBSERVER)
+ .properties(p -> p.noOcclusion().isValidSpawn(Blocks::never))
+ .blockstate(DataGenUtil::noExtraModelOrState)
+ .simpleItem()
+ .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get())
+ .pattern(" ")
+ .pattern("ABC")
+ .pattern(" ")
+ .define('A', Items.OBSERVER)
+ .define('B', ModItems.PROCESSOR)
+ .define('C', AddonItems.KARAKURI_COMPONENT)
+ .unlockedBy(AnvilCraftDatagen.hasItem(AddonItems.KARAKURI_COMPONENT), AnvilCraftDatagen.has(AddonItems.KARAKURI_COMPONENT))
+ .save(provider))
+ .tag(BlockTags.MINEABLE_WITH_PICKAXE)
+ .register();
+
public static final BlockEntry BLOCK_BREAKER = REGISTRATE
.block("block_breaker", BlockBreakerBlock::new)
.lang("Block Breaker")
@@ -317,6 +356,24 @@ public class AddonBlocks {
.tag(BlockTags.MINEABLE_WITH_PICKAXE, Tags.Blocks.STORAGE_BLOCKS)
.register();
+ public static final BlockEntry VOID_CATALYST = REGISTRATE
+ .block("void_catalyst", VoidCatalystBlock::new)
+ .lang("Void Catalyst")
+ .initialProperties(() -> Blocks.IRON_BLOCK)
+ .properties(BlockBehaviour.Properties::randomTicks)
+ .blockstate(DataGenUtil::noExtraModelOrState)
+ .simpleItem()
+ .tag(BlockTags.MINEABLE_WITH_PICKAXE)
+ .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get())
+ .pattern(" A ")
+ .pattern("ABA")
+ .pattern(" A ")
+ .define('A', ModBlocks.VOID_MATTER_BLOCK)
+ .define('B', AddonItems.KARAKURI_COMPONENT)
+ .unlockedBy(AnvilCraftDatagen.hasItem(ModBlocks.VOID_MATTER_BLOCK), AnvilCraftDatagen.has(ModBlocks.VOID_MATTER_BLOCK))
+ .save(provider))
+ .register();
+
public static final BlockEntry DEEPSLATE_CHAOTIC_ORE = REGISTRATE
.block("deepslate_chaotic_ore", Block::new)
.initialProperties(() -> Blocks.DEEPSLATE_IRON_ORE)
@@ -399,63 +456,6 @@ public class AddonBlocks {
tables.add(block, tables.createSilkTouchDispatchTable(block, LootItem.lootTableItem(AddonItems.ECHO_GEODE.get()))))
.register();
- public static final BlockEntry SCULK_EXTRACTOR = REGISTRATE
- .block("sculk_extractor", SculkExtractorBlock::new)
- .lang("Sculk Extractor")
- .initialProperties(() -> Blocks.SCULK)
- .properties(p -> p.mapColor(MapColor.COLOR_BLACK).strength(4.0F, 3.0F).sound(SoundType.SCULK_CATALYST).lightLevel((state) -> 9))
- .blockstate(DataGenUtil::noExtraModelOrState)
- .simpleItem()
- .tag(BlockTags.MINEABLE_WITH_HOE)
- .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get())
- .pattern(" S ")
- .pattern("LCL")
- .pattern("LCL")
- .define('S', Blocks.SCULK_CATALYST)
- .define('L', Items.ECHO_SHARD)
- .define('C', AddonItems.SPIRITUAL_COMPONENT)
- .unlockedBy(AnvilCraftDatagen.hasItem(Items.ECHO_SHARD), AnvilCraftDatagen.has(Items.ECHO_SHARD))
- .save(provider))
- .register();
-
- public static final BlockEntry VOID_CATALYST = REGISTRATE
- .block("void_catalyst", VoidCatalystBlock::new)
- .lang("Void Catalyst")
- .initialProperties(() -> Blocks.IRON_BLOCK)
- .properties(BlockBehaviour.Properties::randomTicks)
- .blockstate(DataGenUtil::noExtraModelOrState)
- .simpleItem()
- .tag(BlockTags.MINEABLE_WITH_PICKAXE)
- .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get())
- .pattern(" A ")
- .pattern("ABA")
- .pattern(" A ")
- .define('A', ModBlocks.VOID_MATTER_BLOCK)
- .define('B', AddonItems.KARAKURI_COMPONENT)
- .unlockedBy(AnvilCraftDatagen.hasItem(ModBlocks.VOID_MATTER_BLOCK), AnvilCraftDatagen.has(ModBlocks.VOID_MATTER_BLOCK))
- .save(provider))
- .register();
-
- public static final BlockEntry EXPERIENCE_INTERFACE = REGISTRATE
- .block("experience_interface", ExperienceInterfaceBlock::new)
- .lang("Experience Interface")
- .initialProperties(() -> Blocks.IRON_BLOCK)
- .properties(p -> p.noOcclusion().isValidSpawn(Blocks::never))
- .blockstate(DataGenUtil::noExtraModelOrState)
- .simpleItem()
- .tag(BlockTags.MINEABLE_WITH_PICKAXE)
- .recipe((ctx, provider) -> ShapedRecipeBuilder.shaped(RecipeCategory.MISC, ctx.get())
- .pattern(" ")
- .pattern(" E ")
- .pattern("ABA")
- .define('A', AddonItems.KARAKURI_COMPONENT)
- .define('B', ModItemTags.BRASS_INGOTS)
- .define('E', ModItems.EXP_GEM)
- .unlockedBy(AnvilCraftDatagen.hasItem(AddonItems.KARAKURI_COMPONENT), AnvilCraftDatagen.has(AddonItems.KARAKURI_COMPONENT))
- .unlockedBy(AnvilCraftDatagen.hasItem(ModItems.EXP_GEM), AnvilCraftDatagen.has(ModItems.EXP_GEM))
- .save(provider))
- .register();
-
public static final BlockEntry FAKE_MENGER_SPONGE = REGISTRATE
.block("fake_menger_sponge", FakeMengerSpongeBlock::new)
.initialProperties(() -> Blocks.SPONGE)
diff --git a/src/main/java/dev/anvilcraft/pigsplus/init/AddonItems.java b/src/main/java/dev/anvilcraft/pigsplus/init/AddonItems.java
index 62b8474b..48e63ca7 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/init/AddonItems.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/init/AddonItems.java
@@ -79,11 +79,6 @@ public class AddonItems {
.save(provider))
.register();
- public static final ItemEntry- UNIVERSAL_REDSTONE_COMPONENT = REGISTRATE
- .item("universal_redstone_component", Item::new)
- .model(DataGenUtil::noExtraModelOrState)
- .register();
-
public static final ItemEntry MENGER_SPONGE_STAFF = REGISTRATE
.item("menger_sponge_staff", MengerSpongeStaffItem::new)
.properties((properties) -> properties.stacksTo(1))
@@ -116,6 +111,11 @@ public class AddonItems {
.model(ModelProviderUtil::bucket)
.register();
+ public static final ItemEntry
- UNIVERSAL_REDSTONE_COMPONENT = REGISTRATE
+ .item("universal_redstone_component", Item::new)
+ .model(DataGenUtil::noExtraModelOrState)
+ .register();
+
public static void register() {
}
}
\ No newline at end of file
diff --git a/src/main/java/dev/anvilcraft/pigsplus/util/ExpUtil.java b/src/main/java/dev/anvilcraft/pigsplus/util/ExpUtil.java
index c8d84d73..226ecd1b 100644
--- a/src/main/java/dev/anvilcraft/pigsplus/util/ExpUtil.java
+++ b/src/main/java/dev/anvilcraft/pigsplus/util/ExpUtil.java
@@ -1,23 +1,9 @@
package dev.anvilcraft.pigsplus.util;
+import net.minecraft.world.entity.player.Player;
+
public class ExpUtil {
public static final int EXPERIENCE_TO_LIQUID = 20;
- public static final int XP_LEVEL_NUM = 3;
- public static final int[] XP_LEVEL_N = {
- 30,
- 15,
- 0
- };
- public static final int[] XP_LEVEL_A = {
- 9,
- 5,
- 2
- };
- public static final int[] XP_LEVEL_B = {
- 112,
- 37,
- 7
- };
public static int getFLuidFromXp(int xp) {
return EXPERIENCE_TO_LIQUID * xp;
@@ -31,23 +17,23 @@ public static int XpRound(int fluid) {
return fluid - fluid % EXPERIENCE_TO_LIQUID;
}
- public static int getXpfromLevel(int level) {
- for (int i = 0; i < XP_LEVEL_NUM; i++) {
- if (level >= XP_LEVEL_N[i]) {
- return level * XP_LEVEL_A[i] + XP_LEVEL_B[i];
- }
+ public static int getXpfromAllLevel(int level) {
+ if (level == 0) {
+ return 0;
+ }
+ if (level > 0 && level < 16) {
+ return level * (12 + level * 2) / 2;
+ } else if (level > 15 && level < 31) {
+ return (level - 15) * (69 + (level - 15) * 5) / 2 + 315;
+ } else {
+ return (int) Math.min(Integer.MAX_VALUE, (level - 30L) * (215 + (level - 30) * 9L) / 2 + 1395);
}
- return 0;
}
- public static int getXpfromAllLevel(int level) {
- int xp = 0;
- for (int i = 0; i < XP_LEVEL_NUM; i++) {
- if (level >= XP_LEVEL_N[i]) {
- xp += (getXpfromLevel(level) + getXpFromFluid(XP_LEVEL_N[i])) * (level - XP_LEVEL_N[i] + 1) / 2;
- level = XP_LEVEL_N[i] - 1;
- }
- }
- return xp;
+ public static int getPlayerXp(Player player) {
+ return (int) Math.min(
+ Integer.MAX_VALUE,
+ getXpfromAllLevel(player.experienceLevel) + ((long) (player.experienceProgress * player.getXpNeededForNextLevel()))
+ );
}
}
diff --git a/src/main/java/dev/anvilcraft/pigsplus/util/FluidUtil.java b/src/main/java/dev/anvilcraft/pigsplus/util/FluidUtil.java
new file mode 100644
index 00000000..10e410e5
--- /dev/null
+++ b/src/main/java/dev/anvilcraft/pigsplus/util/FluidUtil.java
@@ -0,0 +1,32 @@
+package dev.anvilcraft.pigsplus.util;
+
+import dev.dubhe.anvilcraft.init.block.ModFluids;
+import net.minecraft.core.Holder;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.level.material.Fluid;
+import net.neoforged.neoforge.fluids.FluidStack;
+import net.neoforged.neoforge.fluids.capability.IFluidHandler;
+
+public class FluidUtil {
+ public static int fill(IFluidHandler handler, TagKey fluidTagKey, int liquidExp, IFluidHandler.FluidAction action) {
+ for (int tank = 0; tank < handler.getTanks(); tank++) {
+ Holder tankFluid = handler.getFluidInTank(tank).getFluidHolder();
+ if (tankFluid.is(fluidTagKey)) {
+ int accepted = handler.fill(new FluidStack(tankFluid, liquidExp), action);
+ if (accepted > 0) return accepted;
+ }
+ }
+ return handler.fill(new FluidStack(ModFluids.EXP_FLUID, liquidExp), action);
+ }
+
+ public static FluidStack drain(IFluidHandler handler, TagKey fluidTagKey, int liquidExp, IFluidHandler.FluidAction action) {
+ for (int tank = 0; tank < handler.getTanks(); tank++) {
+ Holder tankFluid = handler.getFluidInTank(tank).getFluidHolder();
+ if (tankFluid.is(fluidTagKey)) {
+ FluidStack accepted = handler.drain(new FluidStack(tankFluid, liquidExp), action);
+ if (accepted.getAmount() > 0) return accepted;
+ }
+ }
+ return FluidStack.EMPTY;
+ }
+}
diff --git a/src/main/java/dev/anvilcraft/pigsplus/util/ParticleUtil.java b/src/main/java/dev/anvilcraft/pigsplus/util/ParticleUtil.java
new file mode 100644
index 00000000..232b43f2
--- /dev/null
+++ b/src/main/java/dev/anvilcraft/pigsplus/util/ParticleUtil.java
@@ -0,0 +1,36 @@
+package dev.anvilcraft.pigsplus.util;
+
+import dev.anvilcraft.pigsplus.init.AddonParticleTypes;
+import net.minecraft.core.BlockPos;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.phys.Vec3;
+
+public class ParticleUtil {
+ public static final double EXP_PARTICLE_SPEED = 0.025;
+
+ public static void sendParticle(ServerLevel level, BlockPos startPos, BlockPos endPos) {
+ sendParticle(level, startPos.getCenter(), endPos.getCenter());
+ }
+
+ public static void sendParticle(ServerLevel level, Vec3 startPos, Vec3 endPos) {
+ Vec3 start = startPos.offsetRandom(level.getRandom(), 0.3f);
+ Vec3 end = endPos.offsetRandom(level.getRandom(), 0.3f);
+ Vec3 offset = start.vectorTo(end);
+ double distance = offset.length();
+ sendParticle(level, start, offset, distance * EXP_PARTICLE_SPEED);
+ }
+
+ public static void sendParticle(ServerLevel level, Vec3 start, Vec3 offset, double speed) {
+ level.sendParticles(
+ AddonParticleTypes.EXP.get(),
+ start.x(),
+ start.y(),
+ start.z(),
+ 0,
+ offset.x(),
+ offset.y(),
+ offset.z(),
+ speed
+ );
+ }
+}
diff --git a/src/main/java/dev/anvilcraft/pigsplus/util/StructureDiskUtil.java b/src/main/java/dev/anvilcraft/pigsplus/util/StructureDiskUtil.java
new file mode 100644
index 00000000..a5c1ad9a
--- /dev/null
+++ b/src/main/java/dev/anvilcraft/pigsplus/util/StructureDiskUtil.java
@@ -0,0 +1,77 @@
+package dev.anvilcraft.pigsplus.util;
+
+import dev.dubhe.anvilcraft.init.item.ModComponents;
+import dev.dubhe.anvilcraft.item.property.component.StructureDiskData;
+import net.minecraft.SharedConstants;
+import net.minecraft.core.Direction;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.IntTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.NbtIo;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.storage.LevelResource;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.UUID;
+
+public class StructureDiskUtil {
+
+ public static boolean saveData(Level level, Direction direction, ItemStack held, CompoundTag tag) {
+ try {
+ MinecraftServer server = level.getServer();
+ if (server == null) return false;
+ Path baseDir = server.getWorldPath(LevelResource.ROOT)
+ .toAbsolutePath()
+ .normalize()
+ .resolve("anvilcraft")
+ .resolve("structures");
+ UUID uuid = UUID.randomUUID();
+ String name = "memory_block_comparator";
+ String fileName = "%s_%s.nbt".formatted(name, uuid);
+ Path structureFile = baseDir.resolve(fileName);
+ Files.createDirectories(baseDir);
+ NbtIo.writeCompressed(tag, structureFile);
+
+ StructureDiskData diskData = new StructureDiskData(fileName, name, uuid, direction, 1, 1, 1);
+ held.set(ModComponents.STRUCTURE_DISK_DATA, diskData);
+ return true;
+ } catch (IOException e) {
+ return false;
+ }
+ }
+
+ public static CompoundTag getCompoundTag(BlockState remembered) {
+ CompoundTag tag = new CompoundTag();
+ tag.putInt("DataVersion", SharedConstants.getCurrentVersion().getDataVersion().getVersion());
+ tag.putString("author", "Memory Block Comparator");
+
+ ListTag sizeTag = new ListTag();
+ sizeTag.add(IntTag.valueOf(1));
+ sizeTag.add(IntTag.valueOf(1));
+ sizeTag.add(IntTag.valueOf(1));
+ tag.put("size", sizeTag);
+
+ ListTag paletteTag = new ListTag();
+ paletteTag.add(NbtUtils.writeBlockState(remembered));
+ tag.put("palette", paletteTag);
+
+ ListTag blocksTag = new ListTag();
+ CompoundTag blockTag = new CompoundTag();
+ ListTag posTag = new ListTag();
+ posTag.add(IntTag.valueOf(0));
+ posTag.add(IntTag.valueOf(0));
+ posTag.add(IntTag.valueOf(0));
+ blockTag.put("pos", posTag);
+ blockTag.putInt("state", 0);
+ blocksTag.add(blockTag);
+ tag.put("blocks", blocksTag);
+ tag.put("entities", new ListTag());
+ return tag;
+ }
+}
diff --git a/src/main/resources/assets/anvilcraft/ageratum/en_us/100_pigsplus_automation_components/101_memory_block_comparator.md b/src/main/resources/assets/anvilcraft/ageratum/en_us/100_pigsplus_automation_components/101_memory_block_comparator.md
new file mode 100644
index 00000000..4e3295b9
--- /dev/null
+++ b/src/main/resources/assets/anvilcraft/ageratum/en_us/100_pigsplus_automation_components/101_memory_block_comparator.md
@@ -0,0 +1,24 @@
+---
+navigation:
+ title: "§2Memory Block Comparator"
+ icon: "anvilcraft_pigsplus:memory_block_comparator"
+items:
+ - anvilcraft_pigsplus:memory_block_comparator
+---
+
+#
+
+
+
+# Function
+
+1. Can compare blocks, similar to
-
-
+
+
-
+
@@ -42,3 +42,9 @@ An activated
-
+
diff --git a/src/main/resources/assets/anvilcraft/ageratum/en_us/100_pigsplus_automation_components/201_sculk_extractor.md b/src/main/resources/assets/anvilcraft/ageratum/en_us/100_pigsplus_automation_components/201_sculk_extractor.md
deleted file mode 100644
index 8300755e..00000000
--- a/src/main/resources/assets/anvilcraft/ageratum/en_us/100_pigsplus_automation_components/201_sculk_extractor.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-navigation:
- title: "§6Sculk Extractor"
- icon: "anvilcraft_pigsplus:sculk_extractor"
-items:
- - anvilcraft_pigsplus:sculk_extractor
----
-
-# Sculk Extractor
-
-
-
-Can absorb sculk blocks and release large amounts of experience
-
-> By reverse-engineering the mechanism behind the Sculk Catalyst, the Sculk Extractor was created, capable of reverse-converting sculk blocks into experience orbs
-
-# Obtaining
-
-
-
-# Function
-
-- Devours connected sculk-related blocks within a distance of 7, generating experience based on the amount
--
+
+
+
+# 功能
+
+1. 可以比较方块，类似于
