Skip to content

Commit 5cb5f98

Browse files
Electro593Electro593
committed
More settings changes
1 parent 20f917b commit 5cb5f98

2 files changed

Lines changed: 20 additions & 21 deletions

File tree

‎src/main/java/de/dafuqs/spectrum/entity/SpectrumEntityTypes.java‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,26 +17,26 @@ public class SpectrumEntityTypes {
1717
public static final EntityType<PhantomGlowFrameEntity> GLOW_PHANTOM_FRAME = register("glow_phantom_frame", 10, 2147483647, false, EntityDimensions.changing(0.5F, 0.5F), false, PhantomGlowFrameEntity::new);
1818
public static final EntityType<? extends ThrownItemEntity> BLOCK_FLOODER_PROJECTILE = register("block_flooder_projectile", 4, 10, true, EntityDimensions.changing(0.25F, 0.25F), true, BlockFlooderProjectile::new);
1919
public static final EntityType<InkProjectileEntity> INK_PROJECTILE = register("ink_projectile", 4, 10, true, EntityDimensions.changing(0.3F, 0.3F), true, InkProjectileEntity::new);
20-
public static final EntityType<LagoonFishingBobberEntity> LAGOON_FISHING_BOBBER = register("lagoon_fishing_bobber", EntityType.Builder.<LagoonFishingBobberEntity>create(LagoonFishingBobberEntity::new, SpawnGroup.MISC).disableSaving().disableSummon().makeFireImmune().setDimensions(0.25F, 0.25F).maxTrackingRange(4).trackingTickInterval(5));
21-
public static final EntityType<MoltenFishingBobberEntity> MOLTEN_FISHING_BOBBER = register("molten_fishing_bobber", EntityType.Builder.<MoltenFishingBobberEntity>create(MoltenFishingBobberEntity::new, SpawnGroup.MISC).disableSaving().disableSummon().makeFireImmune().setDimensions(0.25F, 0.25F).maxTrackingRange(4).trackingTickInterval(5));
22-
public static final EntityType<BedrockFishingBobberEntity> BEDROCK_FISHING_BOBBER = register("bedrock_fishing_bobber", EntityType.Builder.<BedrockFishingBobberEntity>create(BedrockFishingBobberEntity::new, SpawnGroup.MISC).disableSaving().disableSummon().makeFireImmune().setDimensions(0.25F, 0.25F).maxTrackingRange(4).trackingTickInterval(5));
20+
public static final EntityType<LagoonFishingBobberEntity> LAGOON_FISHING_BOBBER = register("lagoon_fishing_bobber", EntityType.Builder.<LagoonFishingBobberEntity>create(LagoonFishingBobberEntity::new, SpawnGroup.MISC).disableSaving().disableSummon().makeFireImmune().dimensions(0.25F, 0.25F).maxTrackingRange(4).trackingTickInterval(5));
21+
public static final EntityType<MoltenFishingBobberEntity> MOLTEN_FISHING_BOBBER = register("molten_fishing_bobber", EntityType.Builder.<MoltenFishingBobberEntity>create(MoltenFishingBobberEntity::new, SpawnGroup.MISC).disableSaving().disableSummon().makeFireImmune().dimensions(0.25F, 0.25F).maxTrackingRange(4).trackingTickInterval(5));
22+
public static final EntityType<BedrockFishingBobberEntity> BEDROCK_FISHING_BOBBER = register("bedrock_fishing_bobber", EntityType.Builder.<BedrockFishingBobberEntity>create(BedrockFishingBobberEntity::new, SpawnGroup.MISC).disableSaving().disableSummon().makeFireImmune().dimensions(0.25F, 0.25F).maxTrackingRange(4).trackingTickInterval(5));
2323
public static final EntityType<? extends ItemEntity> FIREPROOF_ITEM = register("fireproof_item", 6, 20, true, EntityDimensions.changing(0.25F, 0.25F), true, FireproofItemEntity::new);
24-
public static final EntityType<EggLayingWoolyPigEntity> EGG_LAYING_WOOLY_PIG = register("egg_laying_wooly_pig", EntityType.Builder.create(EggLayingWoolyPigEntity::new, SpawnGroup.CREATURE).setDimensions(0.9F, 1.3F).maxTrackingRange(10));
25-
public static final EntityType<GlassArrowEntity> GLASS_ARROW = register("glass_arrow", EntityType.Builder.<GlassArrowEntity>create(GlassArrowEntity::new, SpawnGroup.MISC).setDimensions(0.5F, 0.5F).maxTrackingRange(4).trackingTickInterval(20));
24+
public static final EntityType<EggLayingWoolyPigEntity> EGG_LAYING_WOOLY_PIG = register("egg_laying_wooly_pig", EntityType.Builder.create(EggLayingWoolyPigEntity::new, SpawnGroup.CREATURE).dimensions(0.9F, 1.3F).maxTrackingRange(10));
25+
public static final EntityType<GlassArrowEntity> GLASS_ARROW = register("glass_arrow", EntityType.Builder.<GlassArrowEntity>create(GlassArrowEntity::new, SpawnGroup.MISC).dimensions(0.5F, 0.5F).maxTrackingRange(4).trackingTickInterval(20));
2626
public static final EntityType<MiningProjectileEntity> MINING_PROJECTILE = register("mining_projectile", 4, 10, true, EntityDimensions.changing(0.3F, 0.3F), true, MiningProjectileEntity::new);
2727
public static final EntityType<ParametricMiningDeviceEntity> PARAMETRIC_MINING_DEVICE_ENTITY = register("parametric_mining_device", 4, 10, true, EntityDimensions.fixed(0.25F, 0.25F), false, ParametricMiningDeviceEntity::new);
2828
public static final EntityType<BidentEntity> BIDENT = register("bident", 4, 10, true, EntityDimensions.changing(0.5F, 0.5F), true, BidentEntity::new);
2929
public static final EntityType<BidentMirrorImageEntity> BIDENT_MIRROR_IMAGE = register("bident_mirror_image", 4, 10, true, EntityDimensions.changing(0.5F, 0.5F), true, BidentMirrorImageEntity::new);
30-
public static final EntityType<LightShardEntity> LIGHT_SHARD = register("light_shard", EntityType.Builder.<LightShardEntity>create(LightShardEntity::new, SpawnGroup.MISC).disableSaving().makeFireImmune().setDimensions(0.75F, 0.75F).maxTrackingRange(4).trackingTickInterval(20));
31-
public static final EntityType<LightSpearEntity> LIGHT_SPEAR = register("light_spear", EntityType.Builder.<LightSpearEntity>create(LightSpearEntity::new, SpawnGroup.MISC).disableSaving().makeFireImmune().setDimensions(0.75F, 0.75F).maxTrackingRange(4).trackingTickInterval(20));
32-
public static final EntityType<LightMineEntity> LIGHT_MINE = register("light_mine", EntityType.Builder.<LightMineEntity>create(LightMineEntity::new, SpawnGroup.MISC).disableSaving().makeFireImmune().setDimensions(0.75F, 0.75F).maxTrackingRange(4).trackingTickInterval(20));
33-
public static final EntityType<MonstrosityEntity> MONSTROSITY = register("monstrosity", EntityType.Builder.create(MonstrosityEntity::new, SpawnGroup.MISC).makeFireImmune().spawnableFarFromPlayer().setDimensions(6.0F, 6.0F).maxTrackingRange(10));
34-
public static final EntityType<PreservationTurretEntity> PRESERVATION_TURRET = register("preservation_turret", EntityType.Builder.create(PreservationTurretEntity::new, SpawnGroup.MONSTER).makeFireImmune().spawnableFarFromPlayer().setDimensions(1.0F, 1.0F).maxTrackingRange(10));
35-
public static final EntityType<LizardEntity> LIZARD = register("lizard", EntityType.Builder.create(LizardEntity::new, SpawnGroup.MONSTER).setDimensions(1.0F, 0.7F).maxTrackingRange(10));
36-
public static final EntityType<KindlingEntity> KINDLING = register("kindling", EntityType.Builder.create(KindlingEntity::new, SpawnGroup.CREATURE).setDimensions(1.0F, 1.0F).maxTrackingRange(10).makeFireImmune());
37-
public static final EntityType<KindlingCoughEntity> KINDLING_COUGH = register("kindling_cough", EntityType.Builder.<KindlingCoughEntity>create(KindlingCoughEntity::new, SpawnGroup.MISC).setDimensions(0.25F, 0.25F).maxTrackingRange(4).trackingTickInterval(10).makeFireImmune());
38-
public static final EntityType<EraserEntity> ERASER = register("eraser", EntityType.Builder.create(EraserEntity::new, SpawnGroup.MONSTER).setDimensions(0.3F, 0.3F).maxTrackingRange(10));
39-
public static final EntityType<ItemProjectileEntity> ITEM_PROJECTILE = register("item_projectile", EntityType.Builder.<ItemProjectileEntity>create(ItemProjectileEntity::new, SpawnGroup.MISC).setDimensions(0.25F, 0.25F).maxTrackingRange(6).trackingTickInterval(20));
30+
public static final EntityType<LightShardEntity> LIGHT_SHARD = register("light_shard", EntityType.Builder.<LightShardEntity>create(LightShardEntity::new, SpawnGroup.MISC).disableSaving().makeFireImmune().dimensions(0.75F, 0.75F).maxTrackingRange(4).trackingTickInterval(20));
31+
public static final EntityType<LightSpearEntity> LIGHT_SPEAR = register("light_spear", EntityType.Builder.<LightSpearEntity>create(LightSpearEntity::new, SpawnGroup.MISC).disableSaving().makeFireImmune().dimensions(0.75F, 0.75F).maxTrackingRange(4).trackingTickInterval(20));
32+
public static final EntityType<LightMineEntity> LIGHT_MINE = register("light_mine", EntityType.Builder.<LightMineEntity>create(LightMineEntity::new, SpawnGroup.MISC).disableSaving().makeFireImmune().dimensions(0.75F, 0.75F).maxTrackingRange(4).trackingTickInterval(20));
33+
public static final EntityType<MonstrosityEntity> MONSTROSITY = register("monstrosity", EntityType.Builder.create(MonstrosityEntity::new, SpawnGroup.MISC).makeFireImmune().spawnableFarFromPlayer().dimensions(6.0F, 6.0F).maxTrackingRange(10));
34+
public static final EntityType<PreservationTurretEntity> PRESERVATION_TURRET = register("preservation_turret", EntityType.Builder.create(PreservationTurretEntity::new, SpawnGroup.MONSTER).makeFireImmune().spawnableFarFromPlayer().dimensions(1.0F, 1.0F).maxTrackingRange(10));
35+
public static final EntityType<LizardEntity> LIZARD = register("lizard", EntityType.Builder.create(LizardEntity::new, SpawnGroup.MONSTER).dimensions(1.0F, 0.7F).maxTrackingRange(10));
36+
public static final EntityType<KindlingEntity> KINDLING = register("kindling", EntityType.Builder.create(KindlingEntity::new, SpawnGroup.CREATURE).dimensions(1.0F, 1.0F).maxTrackingRange(10).makeFireImmune());
37+
public static final EntityType<KindlingCoughEntity> KINDLING_COUGH = register("kindling_cough", EntityType.Builder.<KindlingCoughEntity>create(KindlingCoughEntity::new, SpawnGroup.MISC).dimensions(0.25F, 0.25F).maxTrackingRange(4).trackingTickInterval(10).makeFireImmune());
38+
public static final EntityType<EraserEntity> ERASER = register("eraser", EntityType.Builder.create(EraserEntity::new, SpawnGroup.MONSTER).dimensions(0.3F, 0.3F).maxTrackingRange(10));
39+
public static final EntityType<ItemProjectileEntity> ITEM_PROJECTILE = register("item_projectile", EntityType.Builder.<ItemProjectileEntity>create(ItemProjectileEntity::new, SpawnGroup.MISC).dimensions(0.25F, 0.25F).maxTrackingRange(6).trackingTickInterval(20));
4040
public static final EntityType<DragonTalonEntity> DRAGON_TALON = register("dragon_talon", 4, 10, true, EntityDimensions.changing(0.5F, 0.5F), true, DragonTalonEntity::new);
4141
public static final EntityType<DraconicTwinswordEntity> DRACONIC_TWINSWORD = register("draconic_twinsword", 6, 2, true, EntityDimensions.changing(0.5F, 0.5F), true, DraconicTwinswordEntity::new);
4242

@@ -45,9 +45,9 @@ public static void register() {
4545
}
4646

4747
public static <X extends Entity> EntityType<X> register(String name, int trackingDistance, int updateIntervalTicks, boolean alwaysUpdateVelocity, EntityDimensions size, boolean fireImmune, EntityType.EntityFactory<X> factory) {
48-
FabricEntityTypeBuilder<X> builder = FabricEntityTypeBuilder.create(SpawnGroup.MISC, factory).trackRangeChunks(trackingDistance).trackedUpdateRate(updateIntervalTicks).forceTrackedVelocityUpdates(alwaysUpdateVelocity).dimensions(size);
48+
EntityType.Builder<X> builder = EntityType.Builder.create(factory, SpawnGroup.MISC).maxTrackingRange(trackingDistance).trackingTickInterval(updateIntervalTicks).alwaysUpdateVelocity(alwaysUpdateVelocity).dimensions(size.width(), size.height());
4949
if (fireImmune) {
50-
builder.fireImmune();
50+
builder.makeFireImmune();
5151
}
5252
return Registry.register(Registries.ENTITY_TYPE, SpectrumCommon.locate(name), builder.build());
5353
}
@@ -66,4 +66,4 @@ private static <T extends Entity> EntityType<T> register(String id, EntityType.B
6666

6767
}
6868

69-
}
69+
}

‎src/main/java/de/dafuqs/spectrum/registries/SpectrumBlockEntities.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import de.dafuqs.spectrum.blocks.structure.*;
3232
import de.dafuqs.spectrum.blocks.titration_barrel.*;
3333
import de.dafuqs.spectrum.blocks.upgrade.*;
34-
import net.fabricmc.fabric.api.object.builder.v1.block.entity.*;
3534
import net.minecraft.block.*;
3635
import net.minecraft.block.entity.*;
3736
import net.minecraft.client.render.block.entity.*;
@@ -91,8 +90,8 @@ public class SpectrumBlockEntities {
9190
public static BlockEntityType<DeepLightBlockEntity> DEEP_LIGHT;
9291
public static BlockEntityType<PlayerTrackerBlockEntity> PLAYER_TRACKING;
9392

94-
private static <T extends BlockEntity> BlockEntityType<T> register(String id, FabricBlockEntityTypeBuilder.Factory<T> factory, Block... blocks) {
95-
return Registry.register(Registries.BLOCK_ENTITY_TYPE, SpectrumCommon.locate(id), FabricBlockEntityTypeBuilder.create(factory, blocks).build());
93+
private static <T extends BlockEntity> BlockEntityType<T> register(String id, BlockEntityType.BlockEntityFactory<T> factory, Block... blocks) {
94+
return Registry.register(Registries.BLOCK_ENTITY_TYPE, SpectrumCommon.locate(id), BlockEntityType.Builder.create(factory, blocks).build());
9695
}
9796

9897
public static void register() {

0 commit comments

Comments
 (0)