[1.20.6] Ported Potion Effect ME (#4843)

* Ported PotionEffect ME * Fix * Fix * I don't know how to do it * Fix --------- Co-authored-by: KlemenDEV <[email protected]>
MCreator · May 24, 2024 · a0ee984 · a0ee984
1 parent 0c82a62
commit a0ee984
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/plugins/generator-1.20.6/neoforge-1.20.6/generator.yaml b/plugins/generator-1.20.6/neoforge-1.20.6/generator.yaml
@@ -47,7 +47,7 @@ structures_dir: "@MODDATAROOT/structures"
 block_textures_dir: "@MODASSETSROOT/textures/block"
 item_textures_dir: "@MODASSETSROOT/textures/item"
 entity_textures_dir: "@MODASSETSROOT/textures/entities"
-#effect_textures_dir: "@MODASSETSROOT/textures/mob_effect"
+effect_textures_dir: "@MODASSETSROOT/textures/mob_effect"
 particle_textures_dir: "@MODASSETSROOT/textures/particle"
 screen_textures_dir: "@MODASSETSROOT/textures/screens"
 armor_textures_dir: "@MODASSETSROOT/textures/models/armor"

diff --git a/...forge-1.20.4/potioneffect.definition.yaml → ...forge-1.20.6/potioneffect.definition.yaml b/...forge-1.20.4/potioneffect.definition.yaml → ...forge-1.20.6/potioneffect.definition.yaml
diff --git a/...lates/elementinits/potioneffects.java.ftl → ...lates/elementinits/potioneffects.java.ftl b/...lates/elementinits/potioneffects.java.ftl → ...lates/elementinits/potioneffects.java.ftl
@@ -38,8 +38,7 @@
 package ${package}.init;
 
 <#assign effects_that_expire = potioneffects?filter(effect -> hasProcedure(effect.onExpired))>
-
-<#if effects_that_expire?size != 0>@Mod.EventBusSubscriber </#if>public class ${JavaModName}MobEffects {
+<#if effects_that_expire?size != 0>@EventBusSubscriber </#if>public class ${JavaModName}MobEffects {
 
  public static final DeferredRegister<MobEffect> REGISTRY = DeferredRegister.create(Registries.MOB_EFFECT, ${JavaModName}.MODID);
 
@@ -65,9 +64,8 @@ package ${package}.init;
 
  private static void expireEffects(Entity entity, MobEffectInstance effectInstance) {
  <#compress>
- MobEffect effect = effectInstance.getEffect();
  <#list effects_that_expire as effect>
- if (effect == ${effect.getModElement().getRegistryNameUpper()}.get()) {
+ if (effectInstance.getEffect().is(${effect.getModElement().getRegistryNameUpper()})) {
  <@procedureCode effect.onExpired, {
  "x": "entity.getX()",
  "y": "entity.getY()",

diff --git a/...ge-1.20.4/templates/potioneffect.java.ftl → ...ge-1.20.6/templates/potioneffect.java.ftl b/...ge-1.20.4/templates/potioneffect.java.ftl → ...ge-1.20.6/templates/potioneffect.java.ftl
@@ -77,7 +77,7 @@ public class ${name}MobEffect extends <#if data.isInstant>Instantenous</#if>MobE
  </#if>
 
  <#if hasProcedure(data.onActiveTick)>
- @Override public void applyEffectTick(LivingEntity entity, int amplifier) {
+ @Override public boolean applyEffectTick(LivingEntity entity, int amplifier) {
  <@procedureCode data.onActiveTick, {
  "x": "entity.getX()",
  "y": "entity.getY()",
@@ -86,6 +86,7 @@ public class ${name}MobEffect extends <#if data.isInstant>Instantenous</#if>MobE
  "entity": "entity",
  "amplifier": "amplifier"
  }/>
+ return super.applyEffectTick(entity, amplifier);
  }
  </#if>