Fixed server not loading particle

ModularMods · Aug 10, 2021 · c560a16 · c560a16
1 parent 96368c8
commit c560a16
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -70,6 +70,12 @@ minecraft {
     }
 }
 
+repositories {
+    maven {
+        url 'http://maven.dynamx.fr/artifactory/DynamXRepo'
+    }
+}
+
 dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
@@ -88,6 +94,8 @@ repositories {
     }
 }
 
+
+
 // Example for how to get properties into the manifest for reading by the runtime..
 jar {
     manifest {

diff --git a/run/ModularWarfare/prototype/assets/modularwarfare/lang/en_US.lang b/run/ModularWarfare/prototype/assets/modularwarfare/lang/en_US.lang
@@ -58,9 +58,9 @@ item.prototype.tactical_vest_lv1_tan.name=Tactical Vest Lv.1
 item.prototype.tactical_vest_lv2_black.name=Tactical Vest Lv.2
 item.prototype.tactical_vest_lv2_green.name=Tactical Vest Lv.2
 item.prototype.tactical_vest_lv2_tan.name=Tactical Vest Lv.2
-item.prototype.uniform_chest.name=Uniform Chest
 item.prototype.uniform_feet.name=Uniform Boots
 item.prototype.uniform_legs.name=Uniform Pants
+item.prototype.uniform_chest.name=Uniform Chest
 item.prototype.vest.name=Vest
 item.prototype.12gauge.name=12 Gauge Shell
 item.prototype.12sluggauge.name=12 Slug Gauge Shot

diff --git a/src/main/java/com/modularwarfare/client/ClientProxy.java b/src/main/java/com/modularwarfare/client/ClientProxy.java
@@ -44,6 +44,7 @@
 import com.modularwarfare.common.grenades.ItemGrenade;
 import com.modularwarfare.common.guns.*;
 import com.modularwarfare.common.particle.EntityBloodFX;
+import com.modularwarfare.common.particle.ParticleExplosion;
 import com.modularwarfare.common.type.BaseType;
 import com.modularwarfare.objects.SoundEntry;
 import com.modularwarfare.utility.MWResourcePack;
@@ -974,4 +975,10 @@ public void resetSens() {
         ClientRenderHooks.isAiming = false;
     }
 
+    @Override
+    public void spawnExplosionParticle(World world, double x, double y, double z) {
+        final Particle explosionParticle = new ParticleExplosion(world, x, y, z);
+        Minecraft.getMinecraft().effectRenderer.addEffect(explosionParticle);
+    }
+
 }
diff --git a/src/main/java/com/modularwarfare/common/CommonProxy.java b/src/main/java/com/modularwarfare/common/CommonProxy.java
@@ -151,6 +151,10 @@ public <T> T loadModel(String s, String shortName, Class<T> typeClass) {
         return null;
     }
 
+    public void spawnExplosionParticle(World par1World, double par2, double par4, double par6) {
+    }
+
+
     public void reloadModels(boolean reloadSkins) {
     }
 

diff --git a/src/main/java/com/modularwarfare/common/entity/grenades/EntityGrenade.java b/src/main/java/com/modularwarfare/common/entity/grenades/EntityGrenade.java
@@ -1,11 +1,8 @@
 package com.modularwarfare.common.entity.grenades;
 
+import com.modularwarfare.ModularWarfare;
 import com.modularwarfare.common.grenades.GrenadeType;
 import com.modularwarfare.common.init.ModSounds;
-import com.modularwarfare.common.particle.EntityBloodFX;
-import com.modularwarfare.common.particle.ParticleExplosion;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.particle.Particle;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.MoverType;
@@ -20,11 +17,9 @@
 import net.minecraft.world.Explosion;
 import net.minecraft.world.World;
 
-
 public class EntityGrenade extends Entity {
 
     private static final DataParameter GRENADE_NAME = EntityDataManager.createKey(EntityGrenade.class, DataSerializers.STRING);
-    private static final DataParameter GRENADE_TYPE = EntityDataManager.createKey(EntityGrenade.class, DataSerializers.STRING);
 
     public EntityLivingBase thrower;
     public GrenadeType grenadeType;
@@ -110,8 +105,7 @@ public void onUpdate() {
                     Explosion explosion = new Explosion(this.world, grenadeType.throwerVulnerable ? null : thrower, posX, posY, posZ, grenadeType.explosionPower, false, grenadeType.damageWorld);
                     explosion.doExplosionA();
                     explosion.doExplosionB(true);
-                    final Particle explosionParticle = new ParticleExplosion(world, this.posX, this.posY, this.posZ);
-                    Minecraft.getMinecraft().effectRenderer.addEffect(explosionParticle);
+                    ModularWarfare.PROXY.spawnExplosionParticle(this.world, this.posX, this.posY, this.posZ);
                 }
                 exploded = true;
             }

diff --git a/src/main/java/com/modularwarfare/common/entity/grenades/EntitySmokeGrenade.java b/src/main/java/com/modularwarfare/common/entity/grenades/EntitySmokeGrenade.java
@@ -25,7 +25,6 @@
 public class EntitySmokeGrenade extends EntityGrenade {
 
     private static final DataParameter GRENADE_NAME = EntityDataManager.createKey(EntitySmokeGrenade.class, DataSerializers.STRING);
-    private static final DataParameter GRENADE_TYPE = EntityDataManager.createKey(EntitySmokeGrenade.class, DataSerializers.STRING);
 
     public float smokeTime = 12 * 20;