TheCloud/joy
1
0
Fork 0
mirror of https://github.com/Pridecraft-Studios/joy.git synced 2025-08-03 06:26:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix: Joy mobs now can spawn their child equivalent

Browse Source 
Fixes #67
This commit is contained in:
Ampflower 🌺 2025-03-14 01:30:22 -07:00
parent d826b925be
commit 6d40ecea86
No known key found for this signature in database
GPG Key ID: FC0397C90D508D7F
6 changed files with 65 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xplat/src/main/java/gay/pridecraft/joy/entity/CustomBeeEntity.java
View File

@ -2,7 +2,10 @@ package gay.pridecraft.joy.entity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.passive.BeeEntity;
import net.minecraft.entity.passive.PassiveEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;
public class CustomBeeEntity extends BeeEntity {
@ -10,6 +13,12 @@ public class CustomBeeEntity extends BeeEntity {
super(entityType, world);
}
@Nullable
@Override
public BeeEntity createChild(final ServerWorld serverWorld, final PassiveEntity passiveEntity) {
return (BeeEntity) this.getType().create(serverWorld);
}
public static class BiiEntity extends CustomBeeEntity {
public BiiEntity(EntityType<? extends BiiEntity> entityType, World world) {
super(entityType, world);

13
xplat/src/main/java/gay/pridecraft/joy/entity/CustomFoxEntity.java
View File

@ -2,13 +2,26 @@ package gay.pridecraft.joy.entity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.passive.FoxEntity;
import net.minecraft.entity.passive.PassiveEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;
public class CustomFoxEntity extends FoxEntity {
public CustomFoxEntity(EntityType<? extends FoxEntity> entityType, World world) {
super(entityType, world);
}
@Nullable
@Override
public FoxEntity createChild(final ServerWorld serverWorld, final PassiveEntity passiveEntity) {
final var fox = (FoxEntity) this.getType().create(serverWorld);
if (fox != null) {
fox.setVariant(this.random.nextBoolean() ? this.getVariant() : ((FoxEntity) passiveEntity).getVariant());
}
return fox;
}
public static class SockFoxEntity extends CustomFoxEntity {
public SockFoxEntity(EntityType<? extends SockFoxEntity> entityType, World world) {
super(entityType, world);

14
xplat/src/main/java/gay/pridecraft/joy/entity/CustomFrogEntity.java
View File

@ -1,15 +1,29 @@
package gay.pridecraft.joy.entity;
import gay.pridecraft.joy.mixin.minecraft.AccessorFrogBrain;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.passive.AnimalEntity;
import net.minecraft.entity.passive.FrogEntity;
import net.minecraft.entity.passive.PassiveEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;
public class CustomFrogEntity extends FrogEntity {
public CustomFrogEntity(EntityType<? extends AnimalEntity> entityType, World world) {
super(entityType, world);
}
@Nullable
@Override
public FrogEntity createChild(final ServerWorld serverWorld, final PassiveEntity passiveEntity) {
final var frog = (FrogEntity) this.getType().create(serverWorld);
if (frog != null) {
AccessorFrogBrain.invokeCoolDownLongJump(frog, serverWorld.getRandom());
}
return frog;
}
public static class FrogEntity extends CustomFrogEntity {
public FrogEntity(EntityType<? extends FrogEntity> entityType, World world) {
super(entityType, world);

9
xplat/src/main/java/gay/pridecraft/joy/entity/CustomSnifferEntity.java
View File

@ -2,8 +2,11 @@ package gay.pridecraft.joy.entity;
import net.minecraft.entity.EntityType;
import net.minecraft.entity.passive.AnimalEntity;
import net.minecraft.entity.passive.PassiveEntity;
import net.minecraft.entity.passive.SnifferEntity;
import net.minecraft.server.world.ServerWorld;
import net.minecraft.world.World;
import org.jetbrains.annotations.Nullable;
public class CustomSnifferEntity extends SnifferEntity {
@ -11,6 +14,12 @@ public class CustomSnifferEntity extends SnifferEntity {
super(entityType, world);
}
@Nullable
@Override
public SnifferEntity createChild(final ServerWorld serverWorld, final PassiveEntity passiveEntity) {
return (SnifferEntity) this.getType().create(serverWorld);
}
public static class SnifferEntity extends CustomSnifferEntity {
public SnifferEntity(EntityType<? extends SnifferEntity> entityType, World world) {
super(entityType, world);

19
xplat/src/main/java/gay/pridecraft/joy/mixin/minecraft/AccessorFrogBrain.java Normal file
View File

@ -0,0 +1,19 @@
package gay.pridecraft.joy.mixin.minecraft;
import net.minecraft.entity.passive.FrogBrain;
import net.minecraft.entity.passive.FrogEntity;
import net.minecraft.util.math.random.Random;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.gen.Invoker;
/**
* @author Ampflower
* @since 1.0.0
**/
@Mixin(FrogBrain.class)
public interface AccessorFrogBrain {
@Invoker
static void invokeCoolDownLongJump(FrogEntity frog, Random random) {
throw new AssertionError();
}
}

2
xplat/src/main/resources/joy.mixins.json
View File

@ -5,7 +5,7 @@
"refmap": "joy.refmap.json",
"compatibilityLevel": "JAVA_21",
"mixins": [
"AllayEntityMixin", "LivingEntityMixin", "PaintingVariantsMixin",
"AllayEntityMixin", "LivingEntityMixin", "PaintingVariantsMixin", "minecraft.AccessorFrogBrain",
"minecraft.AccessorPoi", "minecraft.MixinLivingEntity", "minecraft.MixinPlayerEntity"
],
"injectors": {