From eea4dd1f9d5b84933e0f757965a53867b7270e84 Mon Sep 17 00:00:00 2001 From: NerdyPuzzle <112079900+NerdyPuzzle@users.noreply.github.com> Date: Sun, 4 Feb 2024 19:47:30 +0200 Subject: [PATCH] [1.20.4] Ported the particle mod element (#4585) * ported * forgot to update the copyright --- plugins/generator-1.20.4/neoforge-1.20.4/generator.yaml | 2 +- .../neoforge-1.20.4}/particle.definition.yaml | 0 .../templates/elementinits/particles.java.ftl | 2 +- .../templates/elementinits/particletypes.java.ftl | 6 +++--- .../neoforge-1.20.4}/templates/json/particle.json.ftl | 0 .../neoforge-1.20.4/templates/modbase/mod.java.ftl | 1 + .../neoforge-1.20.4}/templates/particle.java.ftl | 2 +- 7 files changed, 7 insertions(+), 6 deletions(-) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/particle.definition.yaml (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/templates/elementinits/particles.java.ftl (94%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/templates/elementinits/particletypes.java.ftl (85%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/templates/json/particle.json.ftl (100%) rename plugins/{generator-reference-1.20.1/ref-forge-1.20.1 => generator-1.20.4/neoforge-1.20.4}/templates/particle.java.ftl (95%) diff --git a/plugins/generator-1.20.4/neoforge-1.20.4/generator.yaml b/plugins/generator-1.20.4/neoforge-1.20.4/generator.yaml index ad7673847ce..08c78278e74 100644 --- a/plugins/generator-1.20.4/neoforge-1.20.4/generator.yaml +++ b/plugins/generator-1.20.4/neoforge-1.20.4/generator.yaml @@ -45,7 +45,7 @@ structures_dir: "@MODDATAROOT/structures" #item_textures_dir: "@MODASSETSROOT/textures/item" #entity_textures_dir: "@MODASSETSROOT/textures/entities" #effect_textures_dir: "@MODASSETSROOT/textures/mob_effect" -#particle_textures_dir: "@MODASSETSROOT/textures/particle" +particle_textures_dir: "@MODASSETSROOT/textures/particle" screen_textures_dir: "@MODASSETSROOT/textures/screens" #armor_textures_dir: "@MODASSETSROOT/textures/models/armor" other_textures_dir: "@MODASSETSROOT/textures" diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/particle.definition.yaml b/plugins/generator-1.20.4/neoforge-1.20.4/particle.definition.yaml similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/particle.definition.yaml rename to plugins/generator-1.20.4/neoforge-1.20.4/particle.definition.yaml diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/templates/elementinits/particles.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/templates/elementinits/particles.java.ftl similarity index 94% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/templates/elementinits/particles.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/templates/elementinits/particles.java.ftl index e498a173c0b..7f196dade04 100644 --- a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/templates/elementinits/particles.java.ftl +++ b/plugins/generator-1.20.4/neoforge-1.20.4/templates/elementinits/particles.java.ftl @@ -1,7 +1,7 @@ <#-- # MCreator (https://mcreator.net/) # Copyright (C) 2012-2020, Pylo - # Copyright (C) 2020-2023, Pylo, opensource contributors + # Copyright (C) 2020-2024, Pylo, opensource contributors # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/templates/elementinits/particletypes.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/templates/elementinits/particletypes.java.ftl similarity index 85% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/templates/elementinits/particletypes.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/templates/elementinits/particletypes.java.ftl index c6391d5c6ce..26ca4d48b0d 100644 --- a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/templates/elementinits/particletypes.java.ftl +++ b/plugins/generator-1.20.4/neoforge-1.20.4/templates/elementinits/particletypes.java.ftl @@ -1,7 +1,7 @@ <#-- # MCreator (https://mcreator.net/) # Copyright (C) 2012-2020, Pylo - # Copyright (C) 2020-2023, Pylo, opensource contributors + # Copyright (C) 2020-2024, Pylo, opensource contributors # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -38,10 +38,10 @@ package ${package}.init; public class ${JavaModName}ParticleTypes { - public static final DeferredRegister> REGISTRY = DeferredRegister.create(ForgeRegistries.PARTICLE_TYPES, ${JavaModName}.MODID); + public static final DeferredRegister> REGISTRY = DeferredRegister.create(Registries.PARTICLE_TYPE, ${JavaModName}.MODID); <#list particles as particle> - public static final RegistryObject ${particle.getModElement().getRegistryNameUpper()} = + public static final DeferredHolder, SimpleParticleType> ${particle.getModElement().getRegistryNameUpper()} = REGISTRY.register("${particle.getModElement().getRegistryName()}", () -> new SimpleParticleType(${particle.alwaysShow})); diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/templates/json/particle.json.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/templates/json/particle.json.ftl similarity index 100% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/templates/json/particle.json.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/templates/json/particle.json.ftl diff --git a/plugins/generator-1.20.4/neoforge-1.20.4/templates/modbase/mod.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/templates/modbase/mod.java.ftl index 05976f5fae7..c7fc773a0d8 100644 --- a/plugins/generator-1.20.4/neoforge-1.20.4/templates/modbase/mod.java.ftl +++ b/plugins/generator-1.20.4/neoforge-1.20.4/templates/modbase/mod.java.ftl @@ -35,6 +35,7 @@ import org.apache.logging.log4j.Logger; <#if w.hasElementsOfType("potion")>${JavaModName}Potions.REGISTRY.register(modEventBus); <#if w.hasElementsOfType("enchantment")>${JavaModName}Enchantments.REGISTRY.register(modEventBus); <#if w.hasElementsOfType("gui")>${JavaModName}Menus.REGISTRY.register(modEventBus); + <#if w.hasElementsOfType("particle")>${JavaModName}ParticleTypes.REGISTRY.register(modEventBus); } <#-- Networking support below --> diff --git a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/templates/particle.java.ftl b/plugins/generator-1.20.4/neoforge-1.20.4/templates/particle.java.ftl similarity index 95% rename from plugins/generator-reference-1.20.1/ref-forge-1.20.1/templates/particle.java.ftl rename to plugins/generator-1.20.4/neoforge-1.20.4/templates/particle.java.ftl index 4d73949c4d2..9fa53e66ed4 100644 --- a/plugins/generator-reference-1.20.1/ref-forge-1.20.1/templates/particle.java.ftl +++ b/plugins/generator-1.20.4/neoforge-1.20.4/templates/particle.java.ftl @@ -1,7 +1,7 @@ <#-- # MCreator (https://mcreator.net/) # Copyright (C) 2012-2020, Pylo - # Copyright (C) 2020-2023, Pylo, opensource contributors + # Copyright (C) 2020-2024, Pylo, opensource contributors # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by