diff --git a/gradle.properties b/gradle.properties index 06b3bf0..cb3724b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,7 +10,7 @@ loader_version=0.15.11 # Mod Properties mod_name=Particular -mod_version=1.1.1+1.21 +mod_version=1.1.2+1.21 maven_group=com.chailotl.particular archives_base_name=particular diff --git a/src/main/java/com/chailotl/particular/Main.java b/src/main/java/com/chailotl/particular/Main.java index 771c9ac..f6fffea 100644 --- a/src/main/java/com/chailotl/particular/Main.java +++ b/src/main/java/com/chailotl/particular/Main.java @@ -1,8 +1,6 @@ package com.chailotl.particular; -import com.chailotl.particular.compat.RegionsUnexplored; -import com.chailotl.particular.compat.Traverse; -import com.chailotl.particular.compat.WilderWild; +import com.chailotl.particular.compat.*; import com.chailotl.particular.mixin.AccessorBiome; import net.fabricmc.api.ClientModInitializer; @@ -84,6 +82,22 @@ public void onInitializeClient() WilderWild.addLeaves(); } + if (FabricLoader.getInstance().isModLoaded("pearfection")) + { + Pearfection.addLeaves(); + } + + if (FabricLoader.getInstance().isModLoaded("verdant")) + { + Verdant.addLeaves(); + } + + if (FabricLoader.getInstance().isModLoaded("charm")) + { + Charm.addLeaves(); + } + + // Client events ClientChunkEvents.CHUNK_LOAD.register((world, chunk) -> { if (!Main.CONFIG.cascades()) { return; } diff --git a/src/main/java/com/chailotl/particular/Particles.java b/src/main/java/com/chailotl/particular/Particles.java index 234a893..e3d53ac 100644 --- a/src/main/java/com/chailotl/particular/Particles.java +++ b/src/main/java/com/chailotl/particular/Particles.java @@ -54,6 +54,16 @@ public class Particles public static final SimpleParticleType WW_CYPRESS_LEAF = registerParticle("ww_cypress_leaf", ConiferLeafParticle.Factory::new); public static final SimpleParticleType WW_PALM_LEAF = registerParticle("ww_palm_leaf", BigLeafParticle.Factory::new); + // Pearfection leaves + public static final SimpleParticleType PEAR_CALLERY_LEAF = registerParticle("pear_callery_leaf", LeafParticle.Factory::new); + + // Verdant leaves + public static final SimpleParticleType VERD_MULBERRY_LEAF = registerParticle("verd_mulberry_leaf", SpinningLeafParticle.Factory::new); + + // Charm leaves + public static final SimpleParticleType CHARM_EBONY_LEAF = registerParticle("charm_ebony_leaf", LeafParticle.Factory::new); + + // Other particles public static final SimpleParticleType WATER_RIPPLE = registerParticle("water_ripple", WaterRippleParticle.Factory::new); public static final SimpleParticleType ENDER_BUBBLE = registerParticle("ender_bubble", EnderBubbleParticle.Factory::new); diff --git a/src/main/java/com/chailotl/particular/compat/Charm.java b/src/main/java/com/chailotl/particular/compat/Charm.java new file mode 100644 index 0000000..d97c48d --- /dev/null +++ b/src/main/java/com/chailotl/particular/compat/Charm.java @@ -0,0 +1,20 @@ +package com.chailotl.particular.compat; + +import com.chailotl.particular.Main; +import com.chailotl.particular.Particles; +import net.minecraft.util.Identifier; + +public class Charm +{ + private static String MOD_ID = "charm"; + + private static Identifier id(String path) + { + return Identifier.of(MOD_ID, path); + } + + public static void addLeaves() + { + Main.registerLeafData(id("ebony_leaves"), new Main.LeafData(Particles.CHARM_EBONY_LEAF)); + } +} diff --git a/src/main/java/com/chailotl/particular/compat/Pearfection.java b/src/main/java/com/chailotl/particular/compat/Pearfection.java new file mode 100644 index 0000000..d66d361 --- /dev/null +++ b/src/main/java/com/chailotl/particular/compat/Pearfection.java @@ -0,0 +1,23 @@ +package com.chailotl.particular.compat; + +import com.chailotl.particular.Main; +import com.chailotl.particular.Particles; +import net.minecraft.util.Identifier; + +import java.awt.*; + +public class Pearfection +{ + private static String MOD_ID = "pearfection"; + + private static Identifier id(String path) + { + return Identifier.of(MOD_ID, path); + } + + public static void addLeaves() + { + Main.registerLeafData(id("callery_leaves"), new Main.LeafData(Particles.PEAR_CALLERY_LEAF, Color.white)); + Main.registerLeafData(id("flowering_callery_leaves"), new Main.LeafData(Particles.PEAR_CALLERY_LEAF, Color.white)); + } +} diff --git a/src/main/java/com/chailotl/particular/compat/Verdant.java b/src/main/java/com/chailotl/particular/compat/Verdant.java new file mode 100644 index 0000000..d011688 --- /dev/null +++ b/src/main/java/com/chailotl/particular/compat/Verdant.java @@ -0,0 +1,21 @@ +package com.chailotl.particular.compat; + +import com.chailotl.particular.Main; +import com.chailotl.particular.Particles; +import net.minecraft.util.Identifier; + +public class Verdant +{ + private static String MOD_ID = "verdant"; + + private static Identifier id(String path) + { + return Identifier.of(MOD_ID, path); + } + + public static void addLeaves() + { + Main.registerLeafData(id("mulberry_leaves"), new Main.LeafData(Particles.VERD_MULBERRY_LEAF)); + Main.registerLeafData(id("flowering_mulberry_leaves"), new Main.LeafData(Particles.VERD_MULBERRY_LEAF)); + } +} diff --git a/src/main/resources/assets/particular/particles/charm_ebony_leaf.json b/src/main/resources/assets/particular/particles/charm_ebony_leaf.json new file mode 100644 index 0000000..35c8657 --- /dev/null +++ b/src/main/resources/assets/particular/particles/charm_ebony_leaf.json @@ -0,0 +1,8 @@ +{ + "textures": [ + "particular:charm_ebony_leaf_2", + "particular:charm_ebony_leaf_3", + "particular:charm_ebony_leaf_1", + "particular:charm_ebony_leaf_4" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/particular/particles/pear_callery_leaf.json b/src/main/resources/assets/particular/particles/pear_callery_leaf.json new file mode 100644 index 0000000..869767d --- /dev/null +++ b/src/main/resources/assets/particular/particles/pear_callery_leaf.json @@ -0,0 +1,8 @@ +{ + "textures": [ + "particular:pear_callery_leaf_1", + "particular:pear_callery_leaf_2", + "particular:pear_callery_leaf_3", + "particular:pear_callery_leaf_4" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/particular/particles/verd_mulberry_leaf.json b/src/main/resources/assets/particular/particles/verd_mulberry_leaf.json new file mode 100644 index 0000000..f182c22 --- /dev/null +++ b/src/main/resources/assets/particular/particles/verd_mulberry_leaf.json @@ -0,0 +1,8 @@ +{ + "textures": [ + "particular:verd_mulberry_leaf_1", + "particular:verd_mulberry_leaf_2", + "particular:verd_mulberry_leaf_3", + "particular:verd_mulberry_leaf_4" + ] +} \ No newline at end of file diff --git a/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_1.png b/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_1.png new file mode 100644 index 0000000..562b8ef Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_1.png differ diff --git a/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_2.png b/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_2.png new file mode 100644 index 0000000..ddf4da8 Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_2.png differ diff --git a/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_3.png b/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_3.png new file mode 100644 index 0000000..2e9ade5 Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_3.png differ diff --git a/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_4.png b/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_4.png new file mode 100644 index 0000000..847423f Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_4.png differ diff --git a/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_1.png b/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_1.png new file mode 100644 index 0000000..610083e Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_1.png differ diff --git a/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_2.png b/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_2.png new file mode 100644 index 0000000..c6232a5 Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_2.png differ diff --git a/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_3.png b/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_3.png new file mode 100644 index 0000000..210d978 Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_3.png differ diff --git a/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_4.png b/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_4.png new file mode 100644 index 0000000..842f24c Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/pear_callery_leaf_4.png differ diff --git a/src/main/resources/assets/particular/textures/particle/verd_mulberry_1.png b/src/main/resources/assets/particular/textures/particle/verd_mulberry_1.png new file mode 100644 index 0000000..74347dd Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/verd_mulberry_1.png differ diff --git a/src/main/resources/assets/particular/textures/particle/verd_mulberry_2.png b/src/main/resources/assets/particular/textures/particle/verd_mulberry_2.png new file mode 100644 index 0000000..bfe8085 Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/verd_mulberry_2.png differ diff --git a/src/main/resources/assets/particular/textures/particle/verd_mulberry_3.png b/src/main/resources/assets/particular/textures/particle/verd_mulberry_3.png new file mode 100644 index 0000000..1825568 Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/verd_mulberry_3.png differ diff --git a/src/main/resources/assets/particular/textures/particle/verd_mulberry_4.png b/src/main/resources/assets/particular/textures/particle/verd_mulberry_4.png new file mode 100644 index 0000000..a734af5 Binary files /dev/null and b/src/main/resources/assets/particular/textures/particle/verd_mulberry_4.png differ