diff --git a/build.gradle b/build.gradle index d5b3f478..ee523747 100644 --- 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 index 6ed30241..d7d8b90e 100644 --- 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 index 1ce25f7a..6a4af983 100644 --- 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 index 509cae3d..c8446e56 100644 --- a/src/main/java/com/modularwarfare/common/CommonProxy.java +++ b/src/main/java/com/modularwarfare/common/CommonProxy.java @@ -151,6 +151,10 @@ public T loadModel(String s, String shortName, Class 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 index f9164606..724fa397 100644 --- 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 index d546ef65..90b6e47e 100644 --- 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;