From da977e0072639add527d5c3e319c063d5c695134 Mon Sep 17 00:00:00 2001 From: Luthor Lang Date: Thu, 3 Oct 2024 19:26:39 +0100 Subject: [PATCH] More Compat Compatibility with: - Verdant - Pearfection - Charm --- gradle.properties | 2 +- .../java/com/chailotl/particular/Main.java | 20 ++++++++++++--- .../com/chailotl/particular/Particles.java | 10 ++++++++ .../com/chailotl/particular/compat/Charm.java | 20 +++++++++++++++ .../particular/compat/Pearfection.java | 23 ++++++++++++++++++ .../chailotl/particular/compat/Verdant.java | 21 ++++++++++++++++ .../particles/charm_ebony_leaf.json | 8 ++++++ .../particles/pear_callery_leaf.json | 8 ++++++ .../particles/verd_mulberry_leaf.json | 8 ++++++ .../textures/particle/charm_ebony_leaf_1.png | Bin 0 -> 134 bytes .../textures/particle/charm_ebony_leaf_2.png | Bin 0 -> 129 bytes .../textures/particle/charm_ebony_leaf_3.png | Bin 0 -> 133 bytes .../textures/particle/charm_ebony_leaf_4.png | Bin 0 -> 132 bytes .../textures/particle/pear_callery_leaf_1.png | Bin 0 -> 121 bytes .../textures/particle/pear_callery_leaf_2.png | Bin 0 -> 121 bytes .../textures/particle/pear_callery_leaf_3.png | Bin 0 -> 124 bytes .../textures/particle/pear_callery_leaf_4.png | Bin 0 -> 118 bytes .../textures/particle/verd_mulberry_1.png | Bin 0 -> 155 bytes .../textures/particle/verd_mulberry_2.png | Bin 0 -> 151 bytes .../textures/particle/verd_mulberry_3.png | Bin 0 -> 151 bytes .../textures/particle/verd_mulberry_4.png | Bin 0 -> 156 bytes 21 files changed, 116 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/chailotl/particular/compat/Charm.java create mode 100644 src/main/java/com/chailotl/particular/compat/Pearfection.java create mode 100644 src/main/java/com/chailotl/particular/compat/Verdant.java create mode 100644 src/main/resources/assets/particular/particles/charm_ebony_leaf.json create mode 100644 src/main/resources/assets/particular/particles/pear_callery_leaf.json create mode 100644 src/main/resources/assets/particular/particles/verd_mulberry_leaf.json create mode 100644 src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_1.png create mode 100644 src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_2.png create mode 100644 src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_3.png create mode 100644 src/main/resources/assets/particular/textures/particle/charm_ebony_leaf_4.png create mode 100644 src/main/resources/assets/particular/textures/particle/pear_callery_leaf_1.png create mode 100644 src/main/resources/assets/particular/textures/particle/pear_callery_leaf_2.png create mode 100644 src/main/resources/assets/particular/textures/particle/pear_callery_leaf_3.png create mode 100644 src/main/resources/assets/particular/textures/particle/pear_callery_leaf_4.png create mode 100644 src/main/resources/assets/particular/textures/particle/verd_mulberry_1.png create mode 100644 src/main/resources/assets/particular/textures/particle/verd_mulberry_2.png create mode 100644 src/main/resources/assets/particular/textures/particle/verd_mulberry_3.png create mode 100644 src/main/resources/assets/particular/textures/particle/verd_mulberry_4.png 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 0000000000000000000000000000000000000000..562b8ef330386842aab257073e96b3f4c9c66ae7 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJgVe`b78LRj7R&;MsfrA1f^JY$(-*+9V7+16(+4-ojx^DA(bNVvbS_W#Dy b35*QWQuzzjx;nyvW-)lW`njxgN@xNAXrd&x literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..ddf4da8c4e54c5517c55f71ea8a26c4e27e798dc GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJgVe`c)cy{GbHTjHZ7o&OD0zVdvP0D%(Tl80822|Ou|YZC4+to{FSwF47F Y%sjqj`%ERC0F7brboFyt=akR{0EE^k3IG5A literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2e9ade5d7bb9858df82eedf51fef9fc9d3aaac31 GIT binary patch literal 133 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJg^)r^LpWw8 zCn$)isH^>Ve`b78LRj7R&;MsfrQ13utNlAZAtfOpL13al;sw(St)C+kcv2kKB-~$E f`~Tx=2PTF#alU6&Z_V6+MlpE0`njxgN@xNAgqSO> literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..847423f0f578be983529d381a8ec8a78161fa178 GIT binary patch literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJg^xl@LpWw8 zCn$)isH^>Ve`c)cy{GbHTjHZ7o&OD0zVdvP0D%(T62sD0QZI};JUSk1E55(5_J85& bMT`u227FHxCn);?O=9qL^>bP0l+XkKA8skP literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..610083ec6d7a1b9ca3e462f08bc3163fda9c20eb GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJg+Ttkoze^e`?*>U TP24U3)Xw1P>gTe~DWM4f6hkQG literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c6232a5837b715a3a432664dbb5f57fabcb315e8 GIT binary patch literal 121 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJg|)nX?Zb>-DY7zLj+UzcgR@-{VshfySkN;A8!; SU+5lCJA>$j+1|*LJgweJB>$j+1|*LJg^J)yf#lD3fDx=WG3~r1&?JR2UgfwDQY*?a|=} P>SgeB^>bP0l+XkKO&KLr literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..74347dda2e7875e07d1f0bb1efc1fc45c47cd4fe GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJg_nR9mz4B6+rV`Ks22WQ%mvv4FO#lOn BF?Ij| literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..bfe80854409b4f3cc0783684971f7e376c8193d3 GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJg?f3G33^(VjeOkSrF=T4TfxDlD yU0Fg?dmP`}ZjZ>`>!rzX#&Y}N!*@SR_=&BVBe!bTzB&t_;S8RxelF{r5}E*XZZ)+4 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..18255686698ee3f254f00efa9407791c7765ce7a GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^>>$j+1|*LJgJ$Hu$-A%5uGj78ICZ9~WmVTb y>thlMJGpZiPtGc4VsK$eyLL`|!kXfrE2Zx*k^Mc1^I>$j+1|*LJg=^}