Skip to content

Shimmer fishing #16

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
ethanicusss merged 5 commits into from
May 18, 2025
Merged

Shimmer fishing #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1db19d6
shimmmer fishing
HyperRaccoon13 Apr 29, 2025
b574c86
it broke
HyperRaccoon13 Apr 29, 2025
bd7902a
HMM shimmer
HyperRaccoon13 Apr 30, 2025
2758360
Build fix?
HyperRaccoon13 May 3, 2025
0032a93
Merge branch 'master' into shimmer-fishing
ethanicusss May 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/main/java/com/github/ethanicuss/astraladditions/AstralAdditions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import com.github.ethanicuss.astraladditions.entities.ModEntities;
import com.github.ethanicuss.astraladditions.fluids.ModFluids;
import com.github.ethanicuss.astraladditions.particle.ModParticles;
import com.github.ethanicuss.astraladditions.playertracker.WorldRegister;
import com.github.ethanicuss.astraladditions.registry.*;
import net.fabricmc.api.ModInitializer;
Expand All @@ -26,6 +27,7 @@ public void onInitialize() {
ModEntitySpawn.addEntitySpawn();

ModEffects.registerEffects();
ModParticles.registerParticles();

LOGGER.info("Astral Additions is active!");
}
Expand Down
7 changes: 5 additions & 2 deletions src/main/java/com/github/ethanicuss/astraladditions/AstralAdditionsClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,10 @@

import com.github.ethanicuss.astraladditions.entities.ModEntities;
import com.github.ethanicuss.astraladditions.fluids.ModFluids;
import com.github.ethanicuss.astraladditions.particle.ModParticlesClient;
import com.github.ethanicuss.astraladditions.playertracker.PlayerTracker;
import com.github.ethanicuss.astraladditions.registry.ModBlocks;
import com.github.ethanicuss.astraladditions.registry.ModItemProperties;
import net.fabricmc.api.ClientModInitializer;
import net.fabricmc.fabric.api.blockrenderlayer.v1.BlockRenderLayerMap;
import net.fabricmc.fabric.api.client.render.fluid.v1.FluidRenderHandlerRegistry;
Expand Down Expand Up @@ -41,7 +43,8 @@ public void onInitializeClient() {

ModEntities.initClient();
ModBlocks.registerClient();
ModParticlesClient.registerFactories();

ModItemProperties.register();
}
}

}
26 changes: 19 additions & 7 deletions src/main/java/com/github/ethanicuss/astraladditions/entities/ModEntities.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,28 +28,25 @@
import com.github.ethanicuss.astraladditions.entities.pylon.PylonEntity;
import com.github.ethanicuss.astraladditions.entities.pylon.PylonEntityRenderer;
import com.github.ethanicuss.astraladditions.entities.shimmerblaze.*;
import com.github.ethanicuss.astraladditions.entities.shimmerfishingrod.ShimmerFishingBobberEntity;
import com.github.ethanicuss.astraladditions.entities.shimmerfishingrod.ShimmerFishingBobberRenderer;
import com.github.ethanicuss.astraladditions.entities.voidtouchedskeleton.VoidtouchedSkeletonEntity;
import com.github.ethanicuss.astraladditions.entities.voidtouchedskeleton.VoidtouchedSkeletonEntityRenderer;
import com.github.ethanicuss.astraladditions.entities.voidtouchedzombie.VoidtouchedZombieEntity;
import com.github.ethanicuss.astraladditions.entities.voidtouchedzombie.VoidtouchedZombieEntityRenderer;
import com.github.ethanicuss.astraladditions.entities.whast.WhastEntity;
import com.github.ethanicuss.astraladditions.entities.whast.WhastEntityRenderer;
import com.github.ethanicuss.astraladditions.registry.ModBlocks;
import net.fabricmc.fabric.api.client.rendering.v1.EntityModelLayerRegistry;
import net.fabricmc.fabric.api.client.rendering.v1.EntityRendererRegistry;
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricDefaultAttributeRegistry;
import net.fabricmc.fabric.api.object.builder.v1.entity.FabricEntityTypeBuilder;
import net.minecraft.block.Block;
import net.minecraft.block.Blocks;
import net.minecraft.client.render.entity.model.*;
import net.minecraft.entity.EntityDimensions;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.SpawnGroup;
import net.minecraft.entity.SpawnRestriction;
import net.minecraft.entity.mob.HostileEntity;
import net.minecraft.util.Identifier;
import net.minecraft.util.registry.Registry;
import net.minecraft.world.Heightmap;


public class ModEntities {
/*static Block[] blocks = {
Expand Down Expand Up @@ -148,6 +145,18 @@ public class ModEntities {
FabricEntityTypeBuilder.create(SpawnGroup.MISC, BoomerangEntity::new).dimensions(EntityDimensions.fixed(2.0f, 1.5f)).build()
);

public static final EntityType<ShimmerFishingBobberEntity> SHIMMER_FISHING_BOBBER = Registry.register(
Registry.ENTITY_TYPE,
new Identifier(AstralAdditions.MOD_ID, "shimmer_fishing_bobber"),
FabricEntityTypeBuilder.<ShimmerFishingBobberEntity>create(SpawnGroup.MISC, ShimmerFishingBobberEntity::new)
.dimensions(EntityDimensions.fixed(0.25f, 0.25f))
.trackRangeChunks(5)
.trackedUpdateRate(10)
.build()
);



public static void init() {
FabricDefaultAttributeRegistry.register(MOONMAN, MoonmanEntity.createMoonmanAttributes());
FabricDefaultAttributeRegistry.register(HEMOGIANT, HemogiantEntity.createGluttonAttributes());
Expand All @@ -158,6 +167,7 @@ public static void init() {
FabricDefaultAttributeRegistry.register(WHAST, WhastEntity.createWhastAttributes());
FabricDefaultAttributeRegistry.register(ENDER_WATCHER, EnderWatcherEntity.createWatcherAttributes());
FabricDefaultAttributeRegistry.register(GLAZER, GlazerEntity.createGlazerAttributes());

}

public static void initClient() {
Expand Down Expand Up @@ -202,6 +212,8 @@ public static void initClient() {

EntityRendererRegistry.register(SHIMMER_RAIN, ShimmerBlazeRainEntityRenderer::new);

EntityRendererRegistry.register(SHIMMER_FISHING_BOBBER, ShimmerFishingBobberRenderer::new);

EntityRendererRegistry.register(BOOMERANG, BoomerangEntityRenderer::new);
}
}
}
Loading
Loading