firstdarkdev/Hyper-Lighting2
1
0
Fork 0
Code Issues 1 Pull Requests Activity

More Work on Neon Flies and add Auto Spawn

Browse Source
This commit is contained in:
HypherionSA
2022-08-06 01:33:35 +02:00
parent 00a7aa8fb0
commit d628631949
18 changed files with 145 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Common/src/main/java/me/hypherionmc/hyperlighting/Constants.java
View File

@@ -1,11 +1,6 @@
package me.hypherionmc.hyperlighting;
import me.hypherionmc.craterlib.client.gui.tabs.CreativeTabBuilder;
import me.hypherionmc.hyperlighting.common.init.HLBlocks;
import me.hypherionmc.hyperlighting.common.init.HLItems;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.ItemStack;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

1
Common/src/main/java/me/hypherionmc/hyperlighting/client/particles/ParticleRegistryHandler.java
View File

@@ -1,7 +1,6 @@
package me.hypherionmc.hyperlighting.client.particles;
import me.hypherionmc.hyperlighting.common.init.FlameParticles;
import me.hypherionmc.hyperlighting.common.init.HLParticles;
import net.minecraft.client.particle.ParticleEngine;
import net.minecraft.core.particles.ParticleOptions;
import net.minecraft.core.particles.ParticleType;

2
Common/src/main/java/me/hypherionmc/hyperlighting/common/blocks/AdvancedTorchBlock.java
View File

@@ -17,7 +17,6 @@ import net.minecraft.client.color.block.BlockColor;
import net.minecraft.core.BlockPos;
import net.minecraft.core.Direction;
import net.minecraft.core.particles.ParticleTypes;
import net.minecraft.core.particles.SimpleParticleType;
import net.minecraft.network.chat.Component;
import net.minecraft.sounds.SoundEvents;
import net.minecraft.sounds.SoundSource;
@@ -48,7 +47,6 @@ import org.jetbrains.annotations.NotNull;
import java.util.List;
import java.util.Map;
import java.util.function.Supplier;
public class AdvancedTorchBlock extends HorizontalDirectionalBlock implements DyableBlock, LightableBlock {

74
Common/src/main/java/me/hypherionmc/hyperlighting/common/entities/NeonFlyEntity.java
View File

@@ -4,6 +4,7 @@ import me.hypherionmc.hyperlighting.common.entities.ai.FindSimilarEntityGoal;
import net.minecraft.core.BlockPos;
import net.minecraft.nbt.CompoundTag;
import net.minecraft.server.level.ServerLevel;
import net.minecraft.util.RandomSource;
import net.minecraft.world.damagesource.DamageSource;
import net.minecraft.world.entity.*;
import net.minecraft.world.entity.ai.attributes.AttributeSupplier;
@@ -12,20 +13,18 @@ import net.minecraft.world.entity.ai.control.FlyingMoveControl;
import net.minecraft.world.entity.ai.goal.*;
import net.minecraft.world.entity.ai.navigation.FlyingPathNavigation;
import net.minecraft.world.entity.ai.navigation.PathNavigation;
import net.minecraft.world.entity.ai.util.AirAndWaterRandomPos;
import net.minecraft.world.entity.ai.util.HoverRandomPos;
import net.minecraft.world.entity.animal.Animal;
import net.minecraft.world.entity.animal.FlyingAnimal;
import net.minecraft.world.entity.player.Player;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.Level;
import net.minecraft.world.level.LevelAccessor;
import net.minecraft.world.level.LevelReader;
import net.minecraft.world.level.ServerLevelAccessor;
import net.minecraft.world.level.biome.Biomes;
import net.minecraft.world.level.block.Blocks;
import net.minecraft.world.level.block.state.BlockState;
import net.minecraft.world.level.material.Fluids;
import net.minecraft.world.level.pathfinder.BlockPathTypes;
import net.minecraft.world.phys.Vec3;
import org.jetbrains.annotations.Nullable;
import java.util.EnumSet;
@@ -44,20 +43,21 @@ public class NeonFlyEntity extends Animal implements FlyingAnimal {
super(type, level);
this.moveControl = new FlyingMoveControl(this, 20, true);
this.setPathfindingMalus(BlockPathTypes.COCOA, -1.0F);
this.setPathfindingMalus(BlockPathTypes.WATER, -1.0F);
this.setPathfindingMalus(BlockPathTypes.WATER_BORDER, 1.0F);
this.color = DyeColor.byId(new Random().nextInt(DyeColor.values().length - 1));
}
@Override
protected void registerGoals() {
this.goalSelector.addGoal(0, new FireflySwampGoal(this, 1.1D, 24));
this.goalSelector.addGoal(1, new FindSimilarEntityGoal(this, 1.1D, 24, NeonFlyEntity.class));
this.goalSelector.addGoal(2, new FireflyWanderGoal());
this.goalSelector.addGoal(3, new FloatGoal(this));
this.goalSelector.addGoal(4, new BreedGoal(this, 1.0f));
this.goalSelector.addGoal(5, new LookAtPlayerGoal(this, Player.class, 8.0f));
this.goalSelector.addGoal(6, new FleeSunGoal(this, 1.1D));
this.goalSelector.addGoal(0, new FleeSunGoal(this, 1.1D));
this.goalSelector.addGoal(1, new FireflySwampGoal(this, 1.1D, 28));
this.goalSelector.addGoal(2, new FindSimilarEntityGoal(this, 1.1D, 28, NeonFlyEntity.class));
this.goalSelector.addGoal(3, new RandomLookAroundGoal(this));
this.goalSelector.addGoal(4, new AvoidEntityGoal(this, Player.class, 6.0F, 1.0, 1.2));
this.goalSelector.addGoal(5, new WaterAvoidingRandomFlyingGoal(this, 1.4D));
this.goalSelector.addGoal(6, new PanicGoal(this, 1D));
}
@Nullable
@@ -73,8 +73,8 @@ public class NeonFlyEntity extends Animal implements FlyingAnimal {
}
@Override
public void load(CompoundTag pCompound) {
super.load(pCompound);
public void readAdditionalSaveData(CompoundTag pCompound) {
super.readAdditionalSaveData(pCompound);
this.isGlowing = pCompound.getBoolean("isGlowing");
this.color = DyeColor.byId(pCompound.getInt("color"));
}
@@ -114,7 +114,7 @@ public class NeonFlyEntity extends Animal implements FlyingAnimal {
FlyingPathNavigation flyingPathNavigation = new FlyingPathNavigation(this, pLevel) {
@Override
public boolean isStableDestination(BlockPos pPos) {
return true;
return !pLevel.getFluidState(pPos).is(Fluids.WATER) && !pLevel.getFluidState(pPos).is(Fluids.FLOWING_WATER);
}
};
flyingPathNavigation.setCanOpenDoors(false);
@@ -154,51 +154,15 @@ public class NeonFlyEntity extends Animal implements FlyingAnimal {
return 0.5f;
}
public static boolean canSpawn(EntityType<NeonFlyEntity> entity, LevelAccessor levelAccessor, MobSpawnType spawnType, BlockPos pos, Random random) {
return levelAccessor instanceof Level level && !level.isDay() && !level.isRainingAt(pos);
}
class FireflyWanderGoal extends Goal {
FireflyWanderGoal() {
this.setFlags(EnumSet.of(Flag.MOVE));
}
@Override
public boolean canUse() {
return NeonFlyEntity.this.navigation.isDone() && NeonFlyEntity.this.random.nextInt(10) == 0;
}
@Override
public boolean canContinueToUse() {
return NeonFlyEntity.this.navigation.isInProgress();
}
@Override
public void start() {
Vec3 vec3 = this.findPos();
if (vec3 != null) {
NeonFlyEntity.this.navigation.moveTo(
NeonFlyEntity.this.navigation.createPath(new BlockPos(vec3), 1),
1.0D
);
}
}
@Nullable
private Vec3 findPos() {
Vec3 vec3 = NeonFlyEntity.this.getViewVector(0.0f);
Vec3 vec32 = HoverRandomPos.getPos(NeonFlyEntity.this, 8, 7, vec3.x, vec3.z, ((float)Math.PI / 2F), 3, 1);
return vec32 != null ? vec32 : AirAndWaterRandomPos.getPos(NeonFlyEntity.this, 8, 4, -2, vec3.x, vec3.z, (float)Math.PI / 2F);
}
public static <T extends Mob> boolean canSpawn(EntityType<NeonFlyEntity> entity, ServerLevelAccessor levelAccessor, MobSpawnType spawnType, BlockPos pos, RandomSource random) {
return !levelAccessor.getLevel().isDay() && !levelAccessor.getLevel().isRainingAt(pos);
}
static class FireflySwampGoal extends MoveToBlockGoal {
public FireflySwampGoal(PathfinderMob pMob, double pSpeedModifier, int pSearchRange) {
super(pMob, pSpeedModifier, pSearchRange);
this.verticalSearchStart = -2;
this.setFlags(EnumSet.of(Flag.JUMP, Goal.Flag.MOVE));
this.setFlags(EnumSet.of(Goal.Flag.MOVE));
}
@Override
@@ -208,7 +172,7 @@ public class NeonFlyEntity extends Animal implements FlyingAnimal {
@Override
protected int nextStartTick(PathfinderMob pCreature) {
return mob.getLevel().random.nextInt(120);
return mob.getLevel().random.nextInt(500);
}
}
}

6
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/FlameParticles.java
View File

@@ -1,17 +1,11 @@
package me.hypherionmc.hyperlighting.common.init;
import me.hypherionmc.craterlib.common.particles.WrappedSimpleParticleType;
import me.hypherionmc.craterlib.systems.reg.RegistrationProvider;
import me.hypherionmc.craterlib.systems.reg.RegistryObject;
import me.hypherionmc.hyperlighting.Constants;
import net.minecraft.core.Registry;
import net.minecraft.core.particles.ParticleType;
import net.minecraft.core.particles.SimpleParticleType;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.material.MaterialColor;
import java.util.Arrays;
import java.util.function.Supplier;
import static me.hypherionmc.hyperlighting.common.init.HLParticles.register;

1
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLBlocks.java
View File

@@ -5,7 +5,6 @@ import me.hypherionmc.craterlib.systems.reg.RegistrationProvider;
import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.blocks.AdvancedTorchBlock;
import net.minecraft.core.Registry;
import net.minecraft.world.item.CreativeModeTab;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.level.block.Block;

4
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLEntities.java
View File

@@ -16,10 +16,10 @@ public class HLEntities {
public static final RegistrationProvider<EntityType<?>> ENTITIES = RegistrationProvider.get(Registry.ENTITY_TYPE, Constants.MOD_ID);
public static final RegistryObject<EntityType<NeonFlyEntity>> FIREFLY = ENTITIES.register("firefly", () -> EntityType.Builder.of(NeonFlyEntity::new, MobCategory.AMBIENT)
public static final RegistryObject<EntityType<NeonFlyEntity>> NEONFLY = ENTITIES.register("neonfly", () -> EntityType.Builder.of(NeonFlyEntity::new, MobCategory.AMBIENT)
.sized(1f, 1f)
.clientTrackingRange(8)
.build("firefly"));
.build("neonfly"));
public static void loadAll() {}
}

2
Common/src/main/java/me/hypherionmc/hyperlighting/common/init/HLParticles.java
View File

@@ -1,12 +1,10 @@
package me.hypherionmc.hyperlighting.common.init;
import me.hypherionmc.craterlib.common.particles.WrappedSimpleParticleType;
import me.hypherionmc.craterlib.systems.reg.RegistrationProvider;
import me.hypherionmc.craterlib.systems.reg.RegistryObject;
import me.hypherionmc.hyperlighting.Constants;
import net.minecraft.core.Registry;
import net.minecraft.core.particles.ParticleType;
import net.minecraft.core.particles.SimpleParticleType;
import java.util.function.Supplier;

2
Common/src/main/resources/assets/hyperlighting/lang/en_us.json
View File

@@ -3,7 +3,7 @@
"subtitles.torch_ignite": "Torch Ignite Sound",
"entity.hyperlighting.firefly": "Neon Fly",
"entity.hyperlighting.neonfly": "Neon Fly",
"cl.hyperlightingconfig.title": "Hyper Lighting Config",
"cl.torchconfig.litbydefault": "Lit when Placed",

3
Common/src/main/resources/hyperlighting.aw
View File

@@ -1,3 +1,4 @@
accessWidener v1 named
Accessible class net/minecraft/client/particle/ParticleEngine$SpriteParticleRegistration
accessible class net/minecraft/client/particle/ParticleEngine$SpriteParticleRegistration
accessible method net/minecraft/world/entity/SpawnPlacements register (Lnet/minecraft/world/entity/EntityType;Lnet/minecraft/world/entity/SpawnPlacements$Type;Lnet/minecraft/world/level/levelgen/Heightmap$Types;Lnet/minecraft/world/entity/SpawnPlacements$SpawnPredicate;)V

7
Fabric/src/main/java/me/hypherionmc/hyperlighting/HyperLightingFabric.java
View File

@@ -3,15 +3,20 @@ package me.hypherionmc.hyperlighting;
import me.hypherionmc.hyperlighting.common.entities.NeonFlyEntity;
import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
import me.hypherionmc.hyperlighting.common.init.HLEntities;
import me.hypherionmc.hyperlighting.common.worldgen.FabricWorldGen;
import net.fabricmc.api.ModInitializer;
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.level.levelgen.Heightmap;
public class HyperLightingFabric implements ModInitializer {
@Override
public void onInitialize() {
CommonRegistration.registerAll();
FabricWorldGen.registerAll();
FabricDefaultAttributeRegistry.register(HLEntities.FIREFLY.get(), NeonFlyEntity.prepareAttributes());
FabricDefaultAttributeRegistry.register(HLEntities.NEONFLY.get(), NeonFlyEntity.prepareAttributes());
SpawnPlacements.register(HLEntities.NEONFLY.get(), SpawnPlacements.Type.NO_RESTRICTIONS, Heightmap.Types.WORLD_SURFACE, NeonFlyEntity::canSpawn);
}
}

2
Fabric/src/main/java/me/hypherionmc/hyperlighting/client/HyperLightingFabricClient.java
View File

@@ -26,7 +26,7 @@ public class HyperLightingFabricClient implements ClientModInitializer {
}
});
EntityRendererRegistry.register(HLEntities.FIREFLY.get(), NeonFlyRenderer::new);
EntityRendererRegistry.register(HLEntities.NEONFLY.get(), NeonFlyRenderer::new);
EntityModelLayerRegistry.registerModelLayer(NeonFlyModel.LAYER_LOCATION, NeonFlyModel::createBodyLayer);
}
}

30
Fabric/src/main/java/me/hypherionmc/hyperlighting/common/worldgen/FabricWorldGen.java Normal file
View File

@@ -0,0 +1,30 @@
package me.hypherionmc.hyperlighting.common.worldgen;
import me.hypherionmc.hyperlighting.common.init.HLEntities;
import net.fabricmc.fabric.api.biome.v1.BiomeModifications;
import net.fabricmc.fabric.api.biome.v1.BiomeSelectors;
import net.minecraft.world.entity.MobCategory;
import net.minecraft.world.level.biome.Biomes;
/**
* @author HypherionSA
* @date 06/08/2022
*/
public class FabricWorldGen {
public static void registerAll() {
addNeonFlyGen();
}
private static void addNeonFlyGen() {
BiomeModifications.addSpawn(
BiomeSelectors.includeByKey(Biomes.SWAMP),
MobCategory.AMBIENT,
HLEntities.NEONFLY.get(),
10,
8,
25
);
}
}

7
Forge/src/main/java/me/hypherionmc/hyperlighting/HyperLightingForge.java
View File

@@ -6,6 +6,7 @@ import me.hypherionmc.hyperlighting.client.renderer.entity.NeonFlyRenderer;
import me.hypherionmc.hyperlighting.common.entities.NeonFlyEntity;
import me.hypherionmc.hyperlighting.common.init.CommonRegistration;
import me.hypherionmc.hyperlighting.common.init.HLEntities;
import me.hypherionmc.hyperlighting.common.worldgen.ForgeWorldGen;
import net.minecraft.client.renderer.entity.EntityRenderers;
import net.minecraft.world.entity.SpawnPlacements;
import net.minecraft.world.level.levelgen.Heightmap;
@@ -23,16 +24,18 @@ public class HyperLightingForge {
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientInit);
FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonInit);
CommonRegistration.registerAll();
ForgeWorldGen.registerAll(FMLJavaModLoadingContext.get().getModEventBus());
}
public void clientInit(FMLClientSetupEvent event) {
new ClientRegistration().registerAll();
ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((mc, screen) -> new CraterConfigScreen(CommonRegistration.config, screen)));
EntityRenderers.register(HLEntities.FIREFLY.get(), NeonFlyRenderer::new);
EntityRenderers.register(HLEntities.NEONFLY.get(), NeonFlyRenderer::new);
}
public void commonInit(FMLCommonSetupEvent event) {
SpawnPlacements.register(HLEntities.NEONFLY.get(), SpawnPlacements.Type.NO_RESTRICTIONS, Heightmap.Types.WORLD_SURFACE, NeonFlyEntity::canSpawn);
}
}

2
Forge/src/main/java/me/hypherionmc/hyperlighting/common/ForgeCommonHandler.java
View File

@@ -15,7 +15,7 @@ public class ForgeCommonHandler {
@SubscribeEvent
public static void onAttributeCreate(EntityAttributeCreationEvent event) {
event.put(HLEntities.FIREFLY.get(), NeonFlyEntity.prepareAttributes().build());
event.put(HLEntities.NEONFLY.get(), NeonFlyEntity.prepareAttributes().build());
}
}

32
Forge/src/main/java/me/hypherionmc/hyperlighting/common/worldgen/ForgeWorldGen.java Normal file
View File

@@ -0,0 +1,32 @@
package me.hypherionmc.hyperlighting.common.worldgen;
import com.mojang.serialization.Codec;
import com.mojang.serialization.codecs.RecordCodecBuilder;
import me.hypherionmc.hyperlighting.Constants;
import me.hypherionmc.hyperlighting.common.worldgen.biomemodifiers.NeonFlyBiomeModifier;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraftforge.common.world.BiomeModifier;
import net.minecraftforge.eventbus.api.IEventBus;
import net.minecraftforge.registries.DeferredRegister;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
/**
* @author HypherionSA
* @date 05/08/2022
*/
public class ForgeWorldGen {
public static final DeferredRegister<Codec<? extends BiomeModifier>> BIOMEMODIFIERS = DeferredRegister.create(ForgeRegistries.Keys.BIOME_MODIFIER_SERIALIZERS, Constants.MOD_ID);
public static final RegistryObject<Codec<NeonFlyBiomeModifier>> NEONFLY_CODEC = BIOMEMODIFIERS.register(Constants.MOD_ID, () ->
RecordCodecBuilder.create(builder -> builder.group(
Biome.LIST_CODEC.fieldOf("biomes").forGetter(NeonFlyBiomeModifier::biomes),
PlacedFeature.CODEC.fieldOf("feature").forGetter(NeonFlyBiomeModifier::feature)
).apply(builder, NeonFlyBiomeModifier::new)));
public static void registerAll(IEventBus bus) {
BIOMEMODIFIERS.register(bus);
}
}

36
Forge/src/main/java/me/hypherionmc/hyperlighting/common/worldgen/biomemodifiers/NeonFlyBiomeModifier.java Normal file
View File

@@ -0,0 +1,36 @@
package me.hypherionmc.hyperlighting.common.worldgen.biomemodifiers;
import com.mojang.serialization.Codec;
import me.hypherionmc.hyperlighting.Constants;
import net.minecraft.core.Holder;
import net.minecraft.core.HolderSet;
import net.minecraft.resources.ResourceLocation;
import net.minecraft.world.level.biome.Biome;
import net.minecraft.world.level.levelgen.placement.PlacedFeature;
import net.minecraftforge.common.world.BiomeModifier;
import net.minecraftforge.common.world.ModifiableBiomeInfo;
import net.minecraftforge.registries.ForgeRegistries;
import net.minecraftforge.registries.RegistryObject;
import static me.hypherionmc.hyperlighting.common.worldgen.ForgeWorldGen.NEONFLY_CODEC;
/**
* @author HypherionSA
* @date 05/08/2022
*/
public record NeonFlyBiomeModifier(HolderSet<Biome> biomes, Holder<PlacedFeature> feature) implements BiomeModifier {
private static final RegistryObject<Codec<? extends BiomeModifier>> SERIALIZER = RegistryObject.create(new ResourceLocation(Constants.MOD_ID, "neonfly_spawn_serializer"), ForgeRegistries.Keys.BIOME_MODIFIER_SERIALIZERS, Constants.MOD_ID);
@Override
public void modify(Holder<Biome> biome, Phase phase, ModifiableBiomeInfo.BiomeInfo.Builder builder) {
}
@Override
public Codec<? extends BiomeModifier> codec() {
return NEONFLY_CODEC.get();
}
}

10
Forge/src/main/resources/data/hyperlighting/forge/biome_modifier/neonfly_spawn.json Normal file
View File

@@ -0,0 +1,10 @@
{
"type": "forge:add_spawns",
"biomes": "minecraft:swamp",
"spawners": {
"type": "hyperlighting:neonfly",
"weight": 10,
"minCount": 8,
"maxCount": 25
}
}