sub 700!

DaFuqs · DaFuqs · commit 313c0a8986e4 · 2025-12-18T21:31:20.000+01:00
diff --git a/src/main/java/de/dafuqs/spectrum/SpectrumClient.java b/src/main/java/de/dafuqs/spectrum/SpectrumClient.java
@@ -70,6 +70,9 @@ public SpectrumClient(IEventBus modBus, ModContainer modContainer) {
 		NeoForge.EVENT_BUS.addListener((Consumer<AddReloadListenerEvent>) event -> {
 			event.addListener(ParticleSpawnerParticlesDataLoader.INSTANCE);
 		});
+		
+		modBus.addListener(SpectrumColorProviders::registerBlocks);
+		modBus.addListener(SpectrumColorProviders::registerItems);
 	}
 	
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/api/block/FilterConfigurable.java b/src/main/java/de/dafuqs/spectrum/api/block/FilterConfigurable.java
@@ -2,6 +2,7 @@
 
 import de.dafuqs.spectrum.helpers.*;
 import de.dafuqs.spectrum.inventories.slots.*;
+import de.dafuqs.spectrum.networking.c2s_payloads.*;
 import net.minecraft.core.*;
 import net.minecraft.nbt.*;
 import net.minecraft.network.*;
@@ -10,6 +11,7 @@
 import net.minecraft.world.entity.player.*;
 import net.minecraft.world.inventory.*;
 import net.minecraft.world.item.*;
+import net.neoforged.neoforge.network.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
diff --git a/src/main/java/de/dafuqs/spectrum/blocks/pedestal/PedestalBlockEntity.java b/src/main/java/de/dafuqs/spectrum/blocks/pedestal/PedestalBlockEntity.java
@@ -383,7 +383,7 @@ private static boolean craftPedestalRecipe(PedestalBlockEntity pedestalBlockEnti
 			// => Upgrade
 			pedestalBlockEntity.playSound(SpectrumSoundEvents.PEDESTAL_UPGRADE);
 			PedestalBlock.upgradeToVariant(world, pedestalBlockEntity.getBlockPos(), newPedestalVariant);
-			PlayPedestalUpgradedParticlePayload.spawnPedestalUpgradeParticles(world, pedestalBlockEntity.worldPosition, newPedestalVariant);
+			PlayPedestalUpgradedParticlePayload.spawnPedestalUpgradeParticles(pedestalBlockEntity, newPedestalVariant);
 			
 			pedestalBlockEntity.pedestalVariant = newPedestalVariant;
 			pedestalBlockEntity.currentRecipe = null; // reset the recipe, otherwise pedestal would remember crafting the update
diff --git a/src/main/java/de/dafuqs/spectrum/entity/SpectrumEntityTypes.java b/src/main/java/de/dafuqs/spectrum/entity/SpectrumEntityTypes.java
@@ -6,6 +6,7 @@
 import net.minecraft.world.entity.*;
 import net.minecraft.world.entity.item.*;
 import net.minecraft.world.entity.projectile.*;
+import net.neoforged.bus.api.*;
 import net.neoforged.neoforge.event.entity.*;
 import net.neoforged.neoforge.registries.*;
 
@@ -76,4 +77,9 @@ private static <T extends Entity> DeferredHolder<EntityType<?>, EntityType<T>> r
 		return REGISTER.register(id, () -> type.build(SpectrumCommon.MOD_ID + "." + id));
 	}
 	
+	public static void register(IEventBus modBus) {
+		modBus.addListener(SpectrumEntityTypes::registerAttributes);
+		REGISTER.register(modBus);
+	}
+	
 }
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/BedrockFishingBobberEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/BedrockFishingBobberEntity.java
@@ -12,7 +12,7 @@ public BedrockFishingBobberEntity(EntityType<? extends SpectrumFishingBobberEnti
 	}
 	
 	public BedrockFishingBobberEntity(Player thrower, Level world, int luckOfTheSeaLevel, int waitTimeReductionTicks, int exuberanceLevel, int bigCatchLevel, int serendipityReelLevel, boolean inventoryInsertion, boolean foundry) {
-		super(SpectrumEntityTypes.BEDROCK_FISHING_BOBBER, thrower, world, luckOfTheSeaLevel, waitTimeReductionTicks, exuberanceLevel, bigCatchLevel, serendipityReelLevel, inventoryInsertion, foundry);
+		super(SpectrumEntityTypes.BEDROCK_FISHING_BOBBER.get(), thrower, world, luckOfTheSeaLevel, waitTimeReductionTicks, exuberanceLevel, bigCatchLevel, serendipityReelLevel, inventoryInsertion, foundry);
 	}
 	
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/BidentMirrorImageEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/BidentMirrorImageEntity.java
@@ -16,7 +16,7 @@
 
 public class BidentMirrorImageEntity extends BidentBaseEntity {
 	public BidentMirrorImageEntity(Level world) {
-		this(SpectrumEntityTypes.BIDENT_MIRROR_IMAGE, world);
+		this(SpectrumEntityTypes.BIDENT_MIRROR_IMAGE.get(), world);
 	}
 	
 	public BidentMirrorImageEntity(EntityType<? extends ThrownTrident> entityType, Level world) {
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/BlockFlooderProjectile.java b/src/main/java/de/dafuqs/spectrum/entity/entity/BlockFlooderProjectile.java
@@ -16,15 +16,15 @@
 public class BlockFlooderProjectile extends ThrowableItemProjectile {
 	
 	public BlockFlooderProjectile(EntityType<ThrowableItemProjectile> thrownItemEntityEntityType, Level world) {
-		super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE, world);
+		super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE.get(), world);
 	}
 	
 	public BlockFlooderProjectile(Level world, LivingEntity owner) {
-		super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE, owner, world);
+		super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE.get(), owner, world);
 	}
 	
 	public BlockFlooderProjectile(Level world, double x, double y, double z) {
-		super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE, x, y, z, world);
+		super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE.get(), x, y, z, world);
 	}
 	
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/DraconicTwinswordEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/DraconicTwinswordEntity.java
@@ -48,7 +48,7 @@ public class DraconicTwinswordEntity extends BidentBaseEntity implements NonLivi
 	private float damageMult = 1, velMult = 1;
 	
 	public DraconicTwinswordEntity(Level world) {
-		this(SpectrumEntityTypes.DRACONIC_TWINSWORD, world);
+		this(SpectrumEntityTypes.DRACONIC_TWINSWORD.get(), world);
 	}
 	
 	public DraconicTwinswordEntity(EntityType<? extends ThrownTrident> entityType, Level world) {
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/DragonTalonEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/DragonTalonEntity.java
@@ -34,7 +34,7 @@ public class DragonTalonEntity extends BidentBaseEntity {
 	private static final EntityDataAccessor<Boolean> HIT = SynchedEntityData.defineId(DragonTalonEntity.class, EntityDataSerializers.BOOLEAN);
 	
 	public DragonTalonEntity(Level world) {
-		this(SpectrumEntityTypes.DRAGON_TALON, world);
+		this(SpectrumEntityTypes.DRAGON_TALON.get(), world);
 	}
 	
 	public DragonTalonEntity(EntityType<? extends ThrownTrident> entityType, Level world) {
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/FireproofItemEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/FireproofItemEntity.java
@@ -19,14 +19,14 @@ public FireproofItemEntity(Level world, double x, double y, double z, ItemStack
 	}
 	
 	public FireproofItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) {
-		this(SpectrumEntityTypes.FIREPROOF_ITEM, world);
+		this(SpectrumEntityTypes.FIREPROOF_ITEM.get(), world);
 		this.setPos(x, y, z);
 		this.setDeltaMovement(velocityX, velocityY, velocityZ);
 		this.setItem(stack);
 	}
 	
 	private FireproofItemEntity(ItemEntity entity) {
-		super(SpectrumEntityTypes.FIREPROOF_ITEM, entity.level());
+		super(SpectrumEntityTypes.FIREPROOF_ITEM.get(), entity.level());
 	}
 	
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/FloatBlockEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/FloatBlockEntity.java
@@ -71,7 +71,7 @@ public FloatBlockEntity(EntityType<? extends FloatBlockEntity> entityType, Level
 	}
 	
 	public FloatBlockEntity(Level world, BlockPos pos, BlockState blockState) {
-		this(SpectrumEntityTypes.FLOAT_BLOCK, world, pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, blockState);
+		this(SpectrumEntityTypes.FLOAT_BLOCK.get(), world, pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5, blockState);
 	}
 	
 	/**
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/GlassArrowEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/GlassArrowEntity.java
@@ -31,12 +31,12 @@ public GlassArrowEntity(EntityType<? extends GlassArrowEntity> entityType, Level
 	}
 	
 	public GlassArrowEntity(Level world, LivingEntity owner, ItemStack stack, ItemStack shotFrom) {
-		super(SpectrumEntityTypes.GLASS_ARROW, owner, world, stack, shotFrom);
+		super(SpectrumEntityTypes.GLASS_ARROW.get(), owner, world, stack, shotFrom);
 		setBaseDamage(getBaseDamage() * DAMAGE_MODIFIER);
 	}
 	
 	public GlassArrowEntity(Level world, double x, double y, double z, ItemStack stack, ItemStack shotFrom) {
-		super(SpectrumEntityTypes.GLASS_ARROW, x, y, z, world, stack, shotFrom);
+		super(SpectrumEntityTypes.GLASS_ARROW.get(), x, y, z, world, stack, shotFrom);
 		setBaseDamage(getBaseDamage() * DAMAGE_MODIFIER);
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/InkProjectileEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/InkProjectileEntity.java
@@ -43,7 +43,7 @@ public InkProjectileEntity(EntityType<InkProjectileEntity> type, Level world) {
 	}
 	
 	public InkProjectileEntity(double x, double y, double z, Level world) {
-		this(SpectrumEntityTypes.INK_PROJECTILE, world);
+		this(SpectrumEntityTypes.INK_PROJECTILE.get(), world);
 		this.moveTo(x, y, z, this.getYRot(), this.getXRot());
 		this.reapplyPosition();
 	}
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/ItemProjectileEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/ItemProjectileEntity.java
@@ -20,7 +20,7 @@ public ItemProjectileEntity(EntityType<? extends ThrowableItemProjectile> entity
 	}
 	
 	public ItemProjectileEntity(Level world, LivingEntity owner) {
-		super(SpectrumEntityTypes.ITEM_PROJECTILE, owner, world);
+		super(SpectrumEntityTypes.ITEM_PROJECTILE.get(), owner, world);
 	}
 	
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/KindlingCoughEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/KindlingCoughEntity.java
@@ -24,7 +24,7 @@ public KindlingCoughEntity(EntityType<? extends KindlingCoughEntity> entityType,
 	}
 	
 	public KindlingCoughEntity(Level world, LivingEntity owner) {
-		this(SpectrumEntityTypes.KINDLING_COUGH, world);
+		this(SpectrumEntityTypes.KINDLING_COUGH.get(), world);
 		this.setOwner(owner);
 		this.setPos(owner.getX() - (owner.getBbWidth() + 1.0F) * 0.5 * Mth.sin(owner.yBodyRot * 0.017453292F), owner.getEyeY() - 0.1, owner.getZ() + (owner.getBbWidth() + 1.0F) * 0.5 * (double) Mth.cos(owner.yBodyRot * 0.017453292F));
 	}
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/LagoonFishingBobberEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/LagoonFishingBobberEntity.java
@@ -12,7 +12,7 @@ public LagoonFishingBobberEntity(EntityType<? extends LagoonFishingBobberEntity>
 	}
 	
 	public LagoonFishingBobberEntity(Player thrower, Level world, int luckOfTheSeaLevel, int waitTimeReductionTicks, int exuberanceLevel, int bigCatchLevel, int serendipityReelLevel, boolean inventoryInsertion, boolean foundry) {
-		super(SpectrumEntityTypes.LAGOON_FISHING_BOBBER, thrower, world, luckOfTheSeaLevel, waitTimeReductionTicks, exuberanceLevel, bigCatchLevel, serendipityReelLevel, inventoryInsertion, foundry);
+		super(SpectrumEntityTypes.LAGOON_FISHING_BOBBER.get(), thrower, world, luckOfTheSeaLevel, waitTimeReductionTicks, exuberanceLevel, bigCatchLevel, serendipityReelLevel, inventoryInsertion, foundry);
 	}
 	
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/LightMineEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/LightMineEntity.java
@@ -33,7 +33,7 @@ public LightMineEntity(EntityType<? extends Projectile> entityType, Level world)
 	}
 	
 	public LightMineEntity(Level world, LivingEntity owner, float detectionRange, float damage, float lifeSpanTicks) {
-		super(SpectrumEntityTypes.LIGHT_MINE, world, owner, detectionRange, damage, lifeSpanTicks);
+		super(SpectrumEntityTypes.LIGHT_MINE.get(), world, owner, detectionRange, damage, lifeSpanTicks);
 	}
 	
 	public static void summonBarrage(Level world, @Nullable LivingEntity user, @Nullable LivingEntity target, Predicate<LivingEntity> targetPredicate, List<MobEffectInstance> effects, Vec3 position, IntProvider count) {
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/LightShardEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/LightShardEntity.java
@@ -24,7 +24,7 @@ public LightShardEntity(EntityType<? extends Projectile> entityType, Level world
 	}
 	
 	public LightShardEntity(Level world, LivingEntity owner, float damageMod, float lifeSpanTicks) {
-		super(SpectrumEntityTypes.LIGHT_SHARD, world, owner, 48, damageMod, lifeSpanTicks);
+		super(SpectrumEntityTypes.LIGHT_SHARD.get(), world, owner, 48, damageMod, lifeSpanTicks);
 		scaleOffset /= 1.5F;
 		spriteId = world.getRandom().nextInt(4);
 	}
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/LightSpearEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/LightSpearEntity.java
@@ -20,7 +20,7 @@ public LightSpearEntity(EntityType<? extends Projectile> entityType, Level world
 	}
 	
 	public LightSpearEntity(Level world, LivingEntity owner, float damage, int lifeSpanTicks) {
-		super(SpectrumEntityTypes.LIGHT_SPEAR, world, owner, 48, damage, lifeSpanTicks);
+		super(SpectrumEntityTypes.LIGHT_SPEAR.get(), world, owner, 48, damage, lifeSpanTicks);
 	}
 	
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/MiningProjectileEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/MiningProjectileEntity.java
@@ -26,7 +26,7 @@ public MiningProjectileEntity(EntityType<MiningProjectileEntity> type, Level wor
 	}
 	
 	public MiningProjectileEntity(double x, double y, double z, Level world) {
-		this(SpectrumEntityTypes.MINING_PROJECTILE, world);
+		this(SpectrumEntityTypes.MINING_PROJECTILE.get(), world);
 		this.moveTo(x, y, z, this.getYRot(), this.getXRot());
 		this.reapplyPosition();
 	}
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/MoltenFishingBobberEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/MoltenFishingBobberEntity.java
@@ -24,7 +24,7 @@ public void tick() {
 	}
 	
 	public MoltenFishingBobberEntity(Player thrower, Level world, int luckBonus, int waitTimeReductionTicks, int exuberanceLevel, int bigCatchLevel, int serendipityReelLevel, boolean inventoryInsertion) {
-		super(SpectrumEntityTypes.MOLTEN_FISHING_BOBBER, thrower, world, luckBonus, waitTimeReductionTicks, exuberanceLevel, bigCatchLevel, serendipityReelLevel, inventoryInsertion, true);
+		super(SpectrumEntityTypes.MOLTEN_FISHING_BOBBER.get(), thrower, world, luckBonus, waitTimeReductionTicks, exuberanceLevel, bigCatchLevel, serendipityReelLevel, inventoryInsertion, true);
 	}
 	
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/ParametricMiningDeviceEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/ParametricMiningDeviceEntity.java
@@ -20,11 +20,11 @@ public ParametricMiningDeviceEntity(EntityType<? extends ThrowableItemProjectile
 	}
 	
 	public ParametricMiningDeviceEntity(Level world, LivingEntity owner) {
-		super(SpectrumEntityTypes.PARAMETRIC_MINING_DEVICE_ENTITY, owner, world);
+		super(SpectrumEntityTypes.PARAMETRIC_MINING_DEVICE_ENTITY.get(), owner, world);
 	}
 	
 	public ParametricMiningDeviceEntity(Level world, double x, double y, double z) {
-		super(SpectrumEntityTypes.PARAMETRIC_MINING_DEVICE_ENTITY, x, y, z, world);
+		super(SpectrumEntityTypes.PARAMETRIC_MINING_DEVICE_ENTITY.get(), x, y, z, world);
 	}
 	
 	@Override
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/PhantomGlowFrameEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/PhantomGlowFrameEntity.java
@@ -17,7 +17,7 @@ public PhantomGlowFrameEntity(EntityType<? extends ItemFrame> entityType, Level
 	}
 	
 	public PhantomGlowFrameEntity(Level world, BlockPos pos, Direction facing) {
-		this(SpectrumEntityTypes.GLOW_PHANTOM_FRAME, world, pos, facing);
+		this(SpectrumEntityTypes.GLOW_PHANTOM_FRAME.get(), world, pos, facing);
 	}
 	
 	public PhantomGlowFrameEntity(EntityType<? extends ItemFrame> type, Level world, BlockPos pos, Direction facing) {
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/PreservationTurretEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/PreservationTurretEntity.java
@@ -417,7 +417,7 @@ public boolean isValidTarget(@Nullable Entity entity) {
 				&& EntitySelector.NO_CREATIVE_OR_SPECTATOR.test(entity)
 				&& !this.isAlliedTo(entity)
 				&& livingEntity.getType() != EntityType.ARMOR_STAND
-				&& livingEntity.getType() != SpectrumEntityTypes.PRESERVATION_TURRET
+				&& livingEntity.getType() != SpectrumEntityTypes.PRESERVATION_TURRET.get()
 				&& !livingEntity.isInvulnerable()
 				&& !livingEntity.isDeadOrDying()
 				&& this.level().getWorldBorder().isWithinBounds(livingEntity.getBoundingBox());
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/SeatEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/SeatEntity.java
@@ -26,7 +26,7 @@ public SeatEntity(EntityType<?> type, Level world) {
 	}
 	
 	public SeatEntity(Level world, double offset) {
-		super(SpectrumEntityTypes.SEAT, world);
+		super(SpectrumEntityTypes.SEAT.get(), world);
 		this.offset = offset;
 	}
 	
diff --git a/src/main/java/de/dafuqs/spectrum/entity/entity/ShootingStarEntity.java b/src/main/java/de/dafuqs/spectrum/entity/entity/ShootingStarEntity.java
@@ -50,7 +50,7 @@ public ShootingStarEntity(EntityType<? extends ShootingStarEntity> entityType, L
 	}
 	
 	public ShootingStarEntity(Level world, double x, double y, double z, ShootingStar.Variant type, boolean playerPlaced, int availableHits, boolean hardened) {
-		this(SpectrumEntityTypes.SHOOTING_STAR, world);
+		this(SpectrumEntityTypes.SHOOTING_STAR.get(), world);
 		this.setPos(x, y, z);
 		this.setYRot(this.random.nextFloat() * 360.0F);
 		this.setShootingStarType(type, playerPlaced, availableHits, hardened);
diff --git a/src/main/java/de/dafuqs/spectrum/inventories/BedrockAnvilScreen.java b/src/main/java/de/dafuqs/spectrum/inventories/BedrockAnvilScreen.java
@@ -16,6 +16,7 @@
 import net.minecraft.world.inventory.*;
 import net.minecraft.world.item.*;
 import net.neoforged.api.distmarker.*;
+import net.neoforged.neoforge.network.*;
 import org.lwjgl.glfw.*;
 
 @OnlyIn(Dist.CLIENT)
diff --git a/src/main/java/de/dafuqs/spectrum/inventories/ColorPickerScreen.java b/src/main/java/de/dafuqs/spectrum/inventories/ColorPickerScreen.java
@@ -12,6 +12,7 @@
 import net.minecraft.network.chat.*;
 import net.minecraft.resources.*;
 import net.minecraft.world.entity.player.*;
+import net.neoforged.neoforge.network.*;
 
 import java.util.*;
 import java.util.function.*;
diff --git a/src/main/java/de/dafuqs/spectrum/inventories/CompactingChestScreenHandler.java b/src/main/java/de/dafuqs/spectrum/inventories/CompactingChestScreenHandler.java
@@ -8,6 +8,7 @@
 import net.minecraft.world.entity.player.*;
 import net.minecraft.world.inventory.*;
 import net.minecraft.world.item.*;
+import net.neoforged.neoforge.network.*;
 
 public class CompactingChestScreenHandler extends AbstractContainerMenu {
 	
diff --git a/src/main/java/de/dafuqs/spectrum/inventories/PaintbrushScreen.java b/src/main/java/de/dafuqs/spectrum/inventories/PaintbrushScreen.java
@@ -8,6 +8,7 @@
 import net.minecraft.sounds.*;
 import net.minecraft.world.entity.player.*;
 import net.neoforged.api.distmarker.*;
+import net.neoforged.neoforge.network.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
diff --git a/src/main/java/de/dafuqs/spectrum/inventories/ParticleSpawnerScreen.java b/src/main/java/de/dafuqs/spectrum/inventories/ParticleSpawnerScreen.java
@@ -4,6 +4,7 @@
 import de.dafuqs.spectrum.*;
 import de.dafuqs.spectrum.blocks.particle_spawner.*;
 import de.dafuqs.spectrum.data_loaders.*;
+import de.dafuqs.spectrum.mixin.client.accessors.*;
 import de.dafuqs.spectrum.networking.c2s_payloads.*;
 import net.minecraft.*;
 import net.minecraft.client.gui.*;
diff --git a/src/main/java/de/dafuqs/spectrum/inventories/WorkstaffScreen.java b/src/main/java/de/dafuqs/spectrum/inventories/WorkstaffScreen.java
@@ -11,6 +11,7 @@
 import net.minecraft.world.item.*;
 import net.minecraft.world.item.enchantment.*;
 import net.neoforged.api.distmarker.*;
+import net.neoforged.neoforge.network.*;
 
 @OnlyIn(Dist.CLIENT)
 public class WorkstaffScreen extends QuickNavigationGridScreen<WorkstaffScreenHandler> {
diff --git a/src/main/java/de/dafuqs/spectrum/items/item_frame/PhantomFrameItem.java b/src/main/java/de/dafuqs/spectrum/items/item_frame/PhantomFrameItem.java
@@ -15,7 +15,7 @@ public PhantomFrameItem(EntityType<? extends HangingEntity> entityType, Properti
 	
 	@Override
 	public ItemFrame getItemFrameEntity(Level world, BlockPos blockPos, Direction direction) {
-		return new PhantomFrameEntity(SpectrumEntityTypes.PHANTOM_FRAME, world, blockPos, direction);
+		return new PhantomFrameEntity(SpectrumEntityTypes.PHANTOM_FRAME.get(), world, blockPos, direction);
 	}
 	
 }
diff --git a/src/main/java/de/dafuqs/spectrum/items/item_frame/PhantomGlowFrameItem.java b/src/main/java/de/dafuqs/spectrum/items/item_frame/PhantomGlowFrameItem.java
@@ -15,7 +15,7 @@ public PhantomGlowFrameItem(EntityType<? extends HangingEntity> entityType, Prop
 	
 	@Override
 	public ItemFrame getItemFrameEntity(Level world, BlockPos blockPos, Direction direction) {
-		return new PhantomGlowFrameEntity(SpectrumEntityTypes.GLOW_PHANTOM_FRAME, world, blockPos, direction);
+		return new PhantomGlowFrameEntity(SpectrumEntityTypes.GLOW_PHANTOM_FRAME.get(), world, blockPos, direction);
 	}
 	
 }
diff --git a/src/main/java/de/dafuqs/spectrum/items/magic_items/EnderSpliceItem.java b/src/main/java/de/dafuqs/spectrum/items/magic_items/EnderSpliceItem.java
@@ -26,6 +26,7 @@
 import net.minecraft.world.level.portal.*;
 import net.minecraft.world.phys.*;
 import net.neoforged.api.distmarker.*;
+import net.neoforged.neoforge.network.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
diff --git a/src/main/java/de/dafuqs/spectrum/items/magic_items/PaintbrushItem.java b/src/main/java/de/dafuqs/spectrum/items/magic_items/PaintbrushItem.java
@@ -26,6 +26,7 @@
 import net.minecraft.world.level.block.entity.*;
 import net.minecraft.world.level.block.state.*;
 import net.neoforged.api.distmarker.*;
+import net.neoforged.fml.loading.*;
 import org.jetbrains.annotations.*;
 
 import java.util.*;
@@ -44,7 +45,7 @@ public PaintbrushItem(Properties settings) {
 	public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltip, TooltipFlag type) {
 		super.appendHoverText(stack, context, tooltip, type);
 		
-		if (FabricLoader.getInstance().getEnvironmentType() == EnvType.CLIENT) {
+		if (FMLLoader.getDist() == Dist.CLIENT) {
 			appendClientTooltips(stack, tooltip);
 		}
 	}
diff --git a/src/main/java/de/dafuqs/spectrum/mixin/client/ItemRendererMixin.java b/src/main/java/de/dafuqs/spectrum/mixin/client/ItemRendererMixin.java
diff --git a/src/main/java/de/dafuqs/spectrum/networking/c2s_payloads/GuidebookHintBoughtPayload.java b/src/main/java/de/dafuqs/spectrum/networking/c2s_payloads/GuidebookHintBoughtPayload.java
diff --git a/src/main/java/de/dafuqs/spectrum/networking/s2c_payloads/PlayPedestalUpgradedParticlePayload.java b/src/main/java/de/dafuqs/spectrum/networking/s2c_payloads/PlayPedestalUpgradedParticlePayload.java
diff --git a/src/main/java/de/dafuqs/spectrum/particle/client/RaindropParticle.java b/src/main/java/de/dafuqs/spectrum/particle/client/RaindropParticle.java
diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumBlocks.java
diff --git a/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java b/src/main/java/de/dafuqs/spectrum/registries/SpectrumItems.java
diff --git a/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumClientEventListeners.java b/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumClientEventListeners.java
diff --git a/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumColorProviders.java b/src/main/java/de/dafuqs/spectrum/registries/client/SpectrumColorProviders.java
diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,9 @@ public SpectrumClient(IEventBus modBus, ModContainer modContainer) {`
`70`	`70`	`NeoForge.EVENT_BUS.addListener((Consumer<AddReloadListenerEvent>) event -> {`
`71`	`71`	`event.addListener(ParticleSpawnerParticlesDataLoader.INSTANCE);`
`72`	`72`	`});`
	`73`	`+`
	`74`	`+ modBus.addListener(SpectrumColorProviders::registerBlocks);`
	`75`	`+ modBus.addListener(SpectrumColorProviders::registerItems);`
`73`	`76`	`}`
`74`	`77`
`75`	`78`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public BedrockFishingBobberEntity(EntityType<? extends SpectrumFishingBobberEnti`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`public BedrockFishingBobberEntity(Player thrower, Level world, int luckOfTheSeaLevel, int waitTimeReductionTicks, int exuberanceLevel, int bigCatchLevel, int serendipityReelLevel, boolean inventoryInsertion, boolean foundry) {`
`15`		`- super(SpectrumEntityTypes.BEDROCK_FISHING_BOBBER, thrower, world, luckOfTheSeaLevel, waitTimeReductionTicks, exuberanceLevel, bigCatchLevel, serendipityReelLevel, inventoryInsertion, foundry);`
	`15`	`+ super(SpectrumEntityTypes.BEDROCK_FISHING_BOBBER.get(), thrower, world, luckOfTheSeaLevel, waitTimeReductionTicks, exuberanceLevel, bigCatchLevel, serendipityReelLevel, inventoryInsertion, foundry);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`
`17`	`17`	`public class BidentMirrorImageEntity extends BidentBaseEntity {`
`18`	`18`	`public BidentMirrorImageEntity(Level world) {`
`19`		`- this(SpectrumEntityTypes.BIDENT_MIRROR_IMAGE, world);`
	`19`	`+ this(SpectrumEntityTypes.BIDENT_MIRROR_IMAGE.get(), world);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public BidentMirrorImageEntity(EntityType<? extends ThrownTrident> entityType, Level world) {`
Original file line number	Diff line number	Diff line change
`@@ -16,15 +16,15 @@`
`16`	`16`	`public class BlockFlooderProjectile extends ThrowableItemProjectile {`
`17`	`17`
`18`	`18`	`public BlockFlooderProjectile(EntityType<ThrowableItemProjectile> thrownItemEntityEntityType, Level world) {`
`19`		`- super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE, world);`
	`19`	`+ super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE.get(), world);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`public BlockFlooderProjectile(Level world, LivingEntity owner) {`
`23`		`- super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE, owner, world);`
	`23`	`+ super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE.get(), owner, world);`
`24`	`24`	`}`
`25`	`25`
`26`	`26`	`public BlockFlooderProjectile(Level world, double x, double y, double z) {`
`27`		`- super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE, x, y, z, world);`
	`27`	`+ super(SpectrumEntityTypes.BLOCK_FLOODER_PROJECTILE.get(), x, y, z, world);`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public class DraconicTwinswordEntity extends BidentBaseEntity implements NonLivi`
`48`	`48`	`private float damageMult = 1, velMult = 1;`
`49`	`49`
`50`	`50`	`public DraconicTwinswordEntity(Level world) {`
`51`		`- this(SpectrumEntityTypes.DRACONIC_TWINSWORD, world);`
	`51`	`+ this(SpectrumEntityTypes.DRACONIC_TWINSWORD.get(), world);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`public DraconicTwinswordEntity(EntityType<? extends ThrownTrident> entityType, Level world) {`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ public class DragonTalonEntity extends BidentBaseEntity {`
`34`	`34`	`private static final EntityDataAccessor<Boolean> HIT = SynchedEntityData.defineId(DragonTalonEntity.class, EntityDataSerializers.BOOLEAN);`
`35`	`35`
`36`	`36`	`public DragonTalonEntity(Level world) {`
`37`		`- this(SpectrumEntityTypes.DRAGON_TALON, world);`
	`37`	`+ this(SpectrumEntityTypes.DRAGON_TALON.get(), world);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`public DragonTalonEntity(EntityType<? extends ThrownTrident> entityType, Level world) {`
Original file line number	Diff line number	Diff line change
`@@ -19,14 +19,14 @@ public FireproofItemEntity(Level world, double x, double y, double z, ItemStack`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`public FireproofItemEntity(Level world, double x, double y, double z, ItemStack stack, double velocityX, double velocityY, double velocityZ) {`
`22`		`- this(SpectrumEntityTypes.FIREPROOF_ITEM, world);`
	`22`	`+ this(SpectrumEntityTypes.FIREPROOF_ITEM.get(), world);`
`23`	`23`	`this.setPos(x, y, z);`
`24`	`24`	`this.setDeltaMovement(velocityX, velocityY, velocityZ);`
`25`	`25`	`this.setItem(stack);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`private FireproofItemEntity(ItemEntity entity) {`
`29`		`- super(SpectrumEntityTypes.FIREPROOF_ITEM, entity.level());`
	`29`	`+ super(SpectrumEntityTypes.FIREPROOF_ITEM.get(), entity.level());`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`@Override`