Skip to content
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

Jump to bottom

feat: add EntityUndeadComponent #432

Merged
merged 11 commits into from
Oct 10, 2024
Merged

feat: add EntityUndeadComponent #432

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
89b0066
feat: add EntityUndeadComponent
heyhey123-git Oct 4, 2024
a2484fb
use EntityComponent instead of EntityBaseComponent.java
heyhey123-git Oct 4, 2024
1053bdf
rollback auto-generated file
heyhey123-git Oct 4, 2024
4140920
reuse the old name of zombified piglin
heyhey123-git Oct 5, 2024
817c4a8
Delete api/src/main/java/org/allaymc/api/entity/interfaces/EntityZomb…
heyhey123-git Oct 5, 2024
c1a0a0b
add EntityZombiePigman
heyhey123-git Oct 10, 2024
f06f5bf
add EntityZombiePigman
heyhey123-git Oct 10, 2024
a18b285
Update EntityZombiePigman.java
heyhey123-git Oct 10, 2024
5c87e01
remove method EntityUndeadComponent#setCatchesFireUnderSunlight()
heyhey123-git Oct 10, 2024
93dbc91
add default to getCatchesFireUnderSunlight()
heyhey123-git Oct 10, 2024
6ddb0b4
Update EntityUndeadComponent.java
heyhey123-git Oct 10, 2024
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
17 changes: 17 additions & 0 deletions api/src/main/java/org/allaymc/api/entity/component/EntityUndeadComponent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
package org.allaymc.api.entity.component;

public interface EntityUndeadComponent extends EntityBaseComponent {
heyhey123-git marked this conversation as resolved.
Show resolved Hide resolved
/**
* Check if the entity will catch fire under sunlight.
*
* @return {@code true} if the entity will catch fire under sunlight, otherwise {@code false}.
*/
boolean getCatchesFireUnderSunlight();

/**
* Set if the entity will catch fire under sunlight.
*
* @param catchesFireUnderSunlight whether the entity will catch fire under sunlight.
*/
void setCatchesFireUnderSunlight(boolean catchesFireUnderSunlight);
heyhey123-git marked this conversation as resolved.
Show resolved Hide resolved
}
2 changes: 1 addition & 1 deletion api/src/main/java/org/allaymc/api/entity/data/EntityId.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ public enum EntityId {

ZOMBIE_HORSE("minecraft:zombie_horse", 27),

ZOMBIE_PIGMAN("minecraft:zombie_pigman", 36),
ZOMBIFIED_PIGLIN("minecraft:zombie_pigman", 36),
heyhey123-git marked this conversation as resolved.
Show resolved Hide resolved

ZOMBIE_VILLAGER("minecraft:zombie_villager", 44),

Expand Down
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityBogged.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityBogged extends Entity {
public interface EntityBogged extends Entity, EntityUndeadComponent {
}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityDrowned.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityDrowned extends Entity {
public interface EntityDrowned extends Entity, EntityUndeadComponent {

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityHusk.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityHusk extends Entity {
public interface EntityHusk extends Entity, EntityUndeadComponent {

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityPhantom.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityPhantom extends Entity {
public interface EntityPhantom extends Entity, EntityUndeadComponent {

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntitySkeleton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntitySkeleton extends Entity {
public interface EntitySkeleton extends Entity, EntityUndeadComponent {

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntitySkeletonHorse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntitySkeletonHorse extends Entity {
public interface EntitySkeletonHorse extends Entity, EntityUndeadComponent {

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityStray.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityStray extends Entity {
public interface EntityStray extends Entity, EntityUndeadComponent {

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityWither.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityWither extends Entity {
public interface EntityWither extends Entity, EntityUndeadComponent {

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityWitherSkeleton.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityWitherSkeleton extends Entity {
public interface EntityWitherSkeleton extends Entity, EntityUndeadComponent {

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityZoglin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityZoglin extends Entity {
public interface EntityZoglin extends Entity, EntityUndeadComponent {

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityZombie.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityZombie extends Entity {
public interface EntityZombie extends Entity, EntityUndeadComponent {

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityZombieHorse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityZombieHorse extends Entity {
public interface EntityZombieHorse extends Entity, EntityUndeadComponent {

}
7 changes: 0 additions & 7 deletions api/src/main/java/org/allaymc/api/entity/interfaces/EntityZombiePigman.java
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityZombieVillager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityZombieVillager extends Entity {
public interface EntityZombieVillager extends Entity, EntityUndeadComponent {

}
3 changes: 2 additions & 1 deletion api/src/main/java/org/allaymc/api/entity/interfaces/EntityZombieVillagerV2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityZombieVillagerV2 extends Entity {
public interface EntityZombieVillagerV2 extends Entity, EntityUndeadComponent {

}
8 changes: 8 additions & 0 deletions api/src/main/java/org/allaymc/api/entity/interfaces/EntityZombifiedPiglin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package org.allaymc.api.entity.interfaces;

import org.allaymc.api.entity.Entity;
import org.allaymc.api.entity.component.EntityUndeadComponent;

public interface EntityZombifiedPiglin extends Entity, EntityUndeadComponent {

}
2 changes: 1 addition & 1 deletion api/src/main/java/org/allaymc/api/entity/type/EntityTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public final class EntityTypes {

public static EntityType<EntityZombieHorse> ZOMBIE_HORSE;

public static EntityType<EntityZombiePigman> ZOMBIE_PIGMAN;
public static EntityType<EntityZombifiedPiglin> ZOMBIFIED_PIGLIN;
heyhey123-git marked this conversation as resolved.
Show resolved Hide resolved

public static EntityType<EntityZombieVillager> ZOMBIE_VILLAGER;

Expand Down
10 changes: 5 additions & 5 deletions server/src/main/java/org/allaymc/server/entity/type/EntityTypeDefaultInitializer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,11 +1008,11 @@ public static void initZombieHorse() {
.build();
}

public static void initZombiePigman() {
if (EntityTypes.ZOMBIE_PIGMAN != null) return;
EntityTypes.ZOMBIE_PIGMAN = AllayEntityType
.builder(EntityZombiePigman.class)
.vanillaEntity(EntityId.ZOMBIE_PIGMAN)
public static void initZombifiedPiglin() {
heyhey123-git marked this conversation as resolved.
Show resolved Hide resolved
if (EntityTypes.ZOMBIFIED_PIGLIN != null) return;
EntityTypes.ZOMBIFIED_PIGLIN = AllayEntityType
.builder(EntityZombifiedPiglin.class)
.vanillaEntity(EntityId.ZOMBIFIED_PIGLIN)
.build();
}

Expand Down