icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changes to entity load handler keeping it backwards compatible. Fixes #929

Browse Source
This commit is contained in:
gnembon committed 2021-06-25 20:18:12 -03:00
1 parent 2127c3ac8e
commit ac24a67c00
2 files changed
+18 -3
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/carpet/mixins/ServerEntityManager_scarpetMixin.java
+14 -1
View File
@@ -20,7 +20,7 @@ public class ServerEntityManager_scarpetMixin
private void handleAddedEntity(EntityLike entityLike, boolean existing, CallbackInfoReturnable<Boolean> cir)
{
Entity entity = (Entity)entityLike;
CarpetEventServer.Event event = CarpetEventServer.Event.ENTITY_LOAD.get(entity.getType());
CarpetEventServer.Event event = CarpetEventServer.Event.ENTITY_HANDLER.get(entity.getType());
if (event != null)
{
if (event.isNeeded())
@@ -33,6 +33,19 @@ public class ServerEntityManager_scarpetMixin
CarpetScriptServer.LOG.error("Failed to handle entity type " + entity.getType().getTranslationKey());
}
event = CarpetEventServer.Event.ENTITY_LOAD.get(entity.getType());
if (event != null)
{
if (event.isNeeded())
{
event.onEntityAction(entity, true);
}
}
else
{
CarpetScriptServer.LOG.error("Failed to handle entity type " + entity.getType().getTranslationKey());
}
}
}
src/main/java/carpet/script/CarpetEventServer.java
+4 -2
View File
@@ -935,7 +935,8 @@ public class CarpetEventServer
}
@Deprecated
public static final Map<EntityType<? extends Entity>, Event> ENTITY_LOAD= new HashMap<EntityType<? extends Entity>, Event>() {{
public static final Map<EntityType<? extends Entity>, Event> ENTITY_LOAD= new HashMap<>()
{{
EntityType.get("zombie");
Registry.ENTITY_TYPE.forEach(et -> {
put(et, new Event(getEntityLoadEventName(et), 1, true, false)
@@ -957,7 +958,8 @@ public class CarpetEventServer
return "entity_handler_" + ValueConversions.of(Registry.ENTITY_TYPE.getId(et)).getString();
}
public static final Map<EntityType<? extends Entity>, Event> ENTITY_HANDLER= new HashMap<EntityType<? extends Entity>, Event>() {{
public static final Map<EntityType<? extends Entity>, Event> ENTITY_HANDLER= new HashMap<>()
{{
EntityType.get("zombie");
Registry.ENTITY_TYPE.forEach(et -> {
put(et, new Event(getEntityHandlerEventName(et), 2, true, false)