From 9477cf8b688b409f386d4964da5d51f798ab2778 Mon Sep 17 00:00:00 2001 From: Boblet Date: Wed, 9 Mar 2022 16:08:48 +0100 Subject: [PATCH] fortune support for ores, implemented mining plastic explosives (c4&sem) --- .../com/hbm/blocks/bomb/BlockChargeC4.java | 19 ++++++++++-- .../hbm/blocks/bomb/BlockChargeSemtex.java | 31 ++++++++++++++++--- .../com/hbm/blocks/generic/BlockDepthOre.java | 12 +++++++ .../java/com/hbm/blocks/generic/BlockOre.java | 16 ++++++++++ .../explosion/vanillant/DropChanceAlways.java | 16 ---------- .../explosion/vanillant/DropChanceNever.java | 11 ------- .../hbm/explosion/vanillant/ExplosionVNT.java | 13 +++++++- .../{ => interfaces}/IBlockAllocator.java | 4 ++- .../{ => interfaces}/IBlockMutator.java | 4 ++- .../{ => interfaces}/IBlockProcessor.java | 4 ++- .../{ => interfaces}/IDropChanceMutator.java | 4 ++- .../{ => interfaces}/IEntityProcessor.java | 4 ++- .../{ => interfaces}/IExplosionSFX.java | 4 ++- .../{ => interfaces}/IFortuneMutator.java | 4 ++- .../{ => interfaces}/IPlayerProcessor.java | 4 ++- .../BlockAllocatorStandard.java | 5 ++- .../BlockProcessorStandard.java | 21 +++++++++++-- .../standard/DropChanceMutatorStandard.java | 20 ++++++++++++ .../EntityProcessorStandard.java | 5 ++- .../ExplosionEffectStandard.java | 4 ++- .../PlayerProcessorStandard.java | 4 ++- src/main/java/com/hbm/main/ClientProxy.java | 2 +- ...lientEffectsAndParticleHandlingPacket.java | 2 +- 23 files changed, 160 insertions(+), 53 deletions(-) delete mode 100644 src/main/java/com/hbm/explosion/vanillant/DropChanceAlways.java delete mode 100644 src/main/java/com/hbm/explosion/vanillant/DropChanceNever.java rename src/main/java/com/hbm/explosion/vanillant/{ => interfaces}/IBlockAllocator.java (72%) rename src/main/java/com/hbm/explosion/vanillant/{ => interfaces}/IBlockMutator.java (53%) rename src/main/java/com/hbm/explosion/vanillant/{ => interfaces}/IBlockProcessor.java (73%) rename src/main/java/com/hbm/explosion/vanillant/{ => interfaces}/IDropChanceMutator.java (64%) rename src/main/java/com/hbm/explosion/vanillant/{ => interfaces}/IEntityProcessor.java (75%) rename src/main/java/com/hbm/explosion/vanillant/{ => interfaces}/IExplosionSFX.java (63%) rename src/main/java/com/hbm/explosion/vanillant/{ => interfaces}/IFortuneMutator.java (61%) rename src/main/java/com/hbm/explosion/vanillant/{ => interfaces}/IPlayerProcessor.java (76%) rename src/main/java/com/hbm/explosion/vanillant/{ => standard}/BlockAllocatorStandard.java (94%) rename src/main/java/com/hbm/explosion/vanillant/{ => standard}/BlockProcessorStandard.java (76%) create mode 100644 src/main/java/com/hbm/explosion/vanillant/standard/DropChanceMutatorStandard.java rename src/main/java/com/hbm/explosion/vanillant/{ => standard}/EntityProcessorStandard.java (94%) rename src/main/java/com/hbm/explosion/vanillant/{ => standard}/ExplosionEffectStandard.java (93%) rename src/main/java/com/hbm/explosion/vanillant/{ => standard}/PlayerProcessorStandard.java (83%) diff --git a/src/main/java/com/hbm/blocks/bomb/BlockChargeC4.java b/src/main/java/com/hbm/blocks/bomb/BlockChargeC4.java index 3ca182cd9..ef67c63b8 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockChargeC4.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockChargeC4.java @@ -1,9 +1,15 @@ package com.hbm.blocks.bomb; -import com.hbm.explosion.vanillant.BlockAllocatorStandard; +import java.util.List; + import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.standard.BlockAllocatorStandard; +import com.hbm.explosion.vanillant.standard.BlockProcessorStandard; import cpw.mods.fml.client.registry.RenderingRegistry; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; public class BlockChargeC4 extends BlockChargeBase { @@ -16,8 +22,9 @@ public class BlockChargeC4 extends BlockChargeBase { world.setBlockToAir(x, y, z); safe = false; - ExplosionVNT xnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 10F).makeStandard(); - xnt.setBlockAllocator(new BlockAllocatorStandard(64)); + ExplosionVNT xnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 15F).makeStandard(); + xnt.setBlockAllocator(new BlockAllocatorStandard(32)); + xnt.setBlockProcessor(new BlockProcessorStandard().setNoDrop()); xnt.explode(); return BombReturnCode.DETONATED; @@ -32,4 +39,10 @@ public class BlockChargeC4 extends BlockChargeBase { public int getRenderType() { return renderID; } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + super.addInformation(stack, player, list, ext); + list.add(EnumChatFormatting.BLUE + "Does not drop blocks."); + } } diff --git a/src/main/java/com/hbm/blocks/bomb/BlockChargeSemtex.java b/src/main/java/com/hbm/blocks/bomb/BlockChargeSemtex.java index 7b0d1d633..f731c7df2 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockChargeSemtex.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockChargeSemtex.java @@ -1,8 +1,15 @@ package com.hbm.blocks.bomb; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionNT; +import java.util.List; +import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.standard.BlockAllocatorStandard; +import com.hbm.explosion.vanillant.standard.BlockProcessorStandard; +import com.hbm.explosion.vanillant.standard.ExplosionEffectStandard; + +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.world.World; public class BlockChargeSemtex extends BlockChargeBase { @@ -14,9 +21,14 @@ public class BlockChargeSemtex extends BlockChargeBase { safe = true; world.setBlockToAir(x, y, z); safe = false; - ExplosionNT exp = new ExplosionNT(world, null, x + 0.5, y + 0.5, z + 0.5, 4F); - exp.explode(); - ExplosionLarge.spawnParticles(world, x + 0.5, y + 0.5, z + 0.5, 20); + + ExplosionVNT xnt = new ExplosionVNT(world, x + 0.5, y + 0.5, z + 0.5, 10F); + xnt.setBlockAllocator(new BlockAllocatorStandard(32)); + xnt.setBlockProcessor(new BlockProcessorStandard() + .setAllDrop() + .setFortune(3)); + xnt.setSFX(new ExplosionEffectStandard()); + xnt.explode(); return BombReturnCode.DETONATED; } @@ -28,4 +40,13 @@ public class BlockChargeSemtex extends BlockChargeBase { public int getRenderType() { return BlockChargeC4.renderID; } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + super.addInformation(stack, player, list, ext); + list.add(EnumChatFormatting.BLUE + "Will drop all blocks."); + list.add(EnumChatFormatting.BLUE + "Does not do damage."); + list.add(EnumChatFormatting.BLUE + ""); + list.add(EnumChatFormatting.LIGHT_PURPLE + "Fortune III"); + } } diff --git a/src/main/java/com/hbm/blocks/generic/BlockDepthOre.java b/src/main/java/com/hbm/blocks/generic/BlockDepthOre.java index cfe4c8e4a..50ab18551 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockDepthOre.java +++ b/src/main/java/com/hbm/blocks/generic/BlockDepthOre.java @@ -55,4 +55,16 @@ public class BlockDepthOre extends BlockDepth { return super.quantityDropped(rand); } + + @Override + public int quantityDroppedWithBonus(int fortune, Random rand) { + + int mult = rand.nextInt(fortune + 2) - 1; + + if(mult < 0) { + mult = 0; + } + + return this.quantityDropped(rand) * (mult + 1); + } } diff --git a/src/main/java/com/hbm/blocks/generic/BlockOre.java b/src/main/java/com/hbm/blocks/generic/BlockOre.java index 58a129395..6f643733b 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockOre.java +++ b/src/main/java/com/hbm/blocks/generic/BlockOre.java @@ -240,6 +240,22 @@ public class BlockOre extends Block { return 1; } + + @Override + public int quantityDroppedWithBonus(int fortune, Random rand) { + + if(fortune > 0 && Item.getItemFromBlock(this) != this.getItemDropped(0, rand, fortune)) { + int mult = rand.nextInt(fortune + 2) - 1; + + if(mult < 0) { + mult = 0; + } + + return this.quantityDropped(rand) * (mult + 1); + } else { + return this.quantityDropped(rand); + } + } @Override public int damageDropped(int p_149692_1_) { diff --git a/src/main/java/com/hbm/explosion/vanillant/DropChanceAlways.java b/src/main/java/com/hbm/explosion/vanillant/DropChanceAlways.java deleted file mode 100644 index 017e4b7fd..000000000 --- a/src/main/java/com/hbm/explosion/vanillant/DropChanceAlways.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.hbm.explosion.vanillant; - -import net.minecraft.block.Block; - -/** - * Now it's getting ridiculously over-engineered - * @author hbm - * - */ -public class DropChanceAlways implements IDropChanceMutator { - - @Override - public float mutateDropChance(ExplosionVNT explosion, Block block, int x, int y, int z, float chance) { - return 1F; - } -} diff --git a/src/main/java/com/hbm/explosion/vanillant/DropChanceNever.java b/src/main/java/com/hbm/explosion/vanillant/DropChanceNever.java deleted file mode 100644 index 12842fd7e..000000000 --- a/src/main/java/com/hbm/explosion/vanillant/DropChanceNever.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.hbm.explosion.vanillant; - -import net.minecraft.block.Block; - -public class DropChanceNever implements IDropChanceMutator { - - @Override - public float mutateDropChance(ExplosionVNT explosion, Block block, int x, int y, int z, float chance) { - return 0; - } -} diff --git a/src/main/java/com/hbm/explosion/vanillant/ExplosionVNT.java b/src/main/java/com/hbm/explosion/vanillant/ExplosionVNT.java index 34f2a0725..254874315 100644 --- a/src/main/java/com/hbm/explosion/vanillant/ExplosionVNT.java +++ b/src/main/java/com/hbm/explosion/vanillant/ExplosionVNT.java @@ -4,6 +4,17 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; +import com.hbm.explosion.vanillant.interfaces.IBlockAllocator; +import com.hbm.explosion.vanillant.interfaces.IBlockProcessor; +import com.hbm.explosion.vanillant.interfaces.IEntityProcessor; +import com.hbm.explosion.vanillant.interfaces.IExplosionSFX; +import com.hbm.explosion.vanillant.interfaces.IPlayerProcessor; +import com.hbm.explosion.vanillant.standard.BlockAllocatorStandard; +import com.hbm.explosion.vanillant.standard.BlockProcessorStandard; +import com.hbm.explosion.vanillant.standard.EntityProcessorStandard; +import com.hbm.explosion.vanillant.standard.ExplosionEffectStandard; +import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard; + import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.Vec3; @@ -30,7 +41,7 @@ public class ExplosionVNT { protected double posX; protected double posY; protected double posZ; - protected float size; + public float size; public Entity exploder; private Map compatPlayers = new HashMap(); diff --git a/src/main/java/com/hbm/explosion/vanillant/IBlockAllocator.java b/src/main/java/com/hbm/explosion/vanillant/interfaces/IBlockAllocator.java similarity index 72% rename from src/main/java/com/hbm/explosion/vanillant/IBlockAllocator.java rename to src/main/java/com/hbm/explosion/vanillant/interfaces/IBlockAllocator.java index 2407a3960..36d83712a 100644 --- a/src/main/java/com/hbm/explosion/vanillant/IBlockAllocator.java +++ b/src/main/java/com/hbm/explosion/vanillant/interfaces/IBlockAllocator.java @@ -1,7 +1,9 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.interfaces; import java.util.HashSet; +import com.hbm.explosion.vanillant.ExplosionVNT; + import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/explosion/vanillant/IBlockMutator.java b/src/main/java/com/hbm/explosion/vanillant/interfaces/IBlockMutator.java similarity index 53% rename from src/main/java/com/hbm/explosion/vanillant/IBlockMutator.java rename to src/main/java/com/hbm/explosion/vanillant/interfaces/IBlockMutator.java index 078ee3c0b..d1e29ecbc 100644 --- a/src/main/java/com/hbm/explosion/vanillant/IBlockMutator.java +++ b/src/main/java/com/hbm/explosion/vanillant/interfaces/IBlockMutator.java @@ -1,4 +1,6 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.interfaces; + +import com.hbm.explosion.vanillant.ExplosionVNT; public interface IBlockMutator { diff --git a/src/main/java/com/hbm/explosion/vanillant/IBlockProcessor.java b/src/main/java/com/hbm/explosion/vanillant/interfaces/IBlockProcessor.java similarity index 73% rename from src/main/java/com/hbm/explosion/vanillant/IBlockProcessor.java rename to src/main/java/com/hbm/explosion/vanillant/interfaces/IBlockProcessor.java index 0b0d93cbd..da2b6a7d8 100644 --- a/src/main/java/com/hbm/explosion/vanillant/IBlockProcessor.java +++ b/src/main/java/com/hbm/explosion/vanillant/interfaces/IBlockProcessor.java @@ -1,7 +1,9 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.interfaces; import java.util.HashSet; +import com.hbm.explosion.vanillant.ExplosionVNT; + import net.minecraft.world.ChunkPosition; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/explosion/vanillant/IDropChanceMutator.java b/src/main/java/com/hbm/explosion/vanillant/interfaces/IDropChanceMutator.java similarity index 64% rename from src/main/java/com/hbm/explosion/vanillant/IDropChanceMutator.java rename to src/main/java/com/hbm/explosion/vanillant/interfaces/IDropChanceMutator.java index 107358af8..f0560d61b 100644 --- a/src/main/java/com/hbm/explosion/vanillant/IDropChanceMutator.java +++ b/src/main/java/com/hbm/explosion/vanillant/interfaces/IDropChanceMutator.java @@ -1,4 +1,6 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.interfaces; + +import com.hbm.explosion.vanillant.ExplosionVNT; import net.minecraft.block.Block; diff --git a/src/main/java/com/hbm/explosion/vanillant/IEntityProcessor.java b/src/main/java/com/hbm/explosion/vanillant/interfaces/IEntityProcessor.java similarity index 75% rename from src/main/java/com/hbm/explosion/vanillant/IEntityProcessor.java rename to src/main/java/com/hbm/explosion/vanillant/interfaces/IEntityProcessor.java index 21f9431fc..451e072f5 100644 --- a/src/main/java/com/hbm/explosion/vanillant/IEntityProcessor.java +++ b/src/main/java/com/hbm/explosion/vanillant/interfaces/IEntityProcessor.java @@ -1,7 +1,9 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.interfaces; import java.util.HashMap; +import com.hbm.explosion.vanillant.ExplosionVNT; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/explosion/vanillant/IExplosionSFX.java b/src/main/java/com/hbm/explosion/vanillant/interfaces/IExplosionSFX.java similarity index 63% rename from src/main/java/com/hbm/explosion/vanillant/IExplosionSFX.java rename to src/main/java/com/hbm/explosion/vanillant/interfaces/IExplosionSFX.java index c87b93e27..0155b663a 100644 --- a/src/main/java/com/hbm/explosion/vanillant/IExplosionSFX.java +++ b/src/main/java/com/hbm/explosion/vanillant/interfaces/IExplosionSFX.java @@ -1,4 +1,6 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.interfaces; + +import com.hbm.explosion.vanillant.ExplosionVNT; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/explosion/vanillant/IFortuneMutator.java b/src/main/java/com/hbm/explosion/vanillant/interfaces/IFortuneMutator.java similarity index 61% rename from src/main/java/com/hbm/explosion/vanillant/IFortuneMutator.java rename to src/main/java/com/hbm/explosion/vanillant/interfaces/IFortuneMutator.java index e8fe4762a..e8dff641f 100644 --- a/src/main/java/com/hbm/explosion/vanillant/IFortuneMutator.java +++ b/src/main/java/com/hbm/explosion/vanillant/interfaces/IFortuneMutator.java @@ -1,4 +1,6 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.interfaces; + +import com.hbm.explosion.vanillant.ExplosionVNT; import net.minecraft.block.Block; diff --git a/src/main/java/com/hbm/explosion/vanillant/IPlayerProcessor.java b/src/main/java/com/hbm/explosion/vanillant/interfaces/IPlayerProcessor.java similarity index 76% rename from src/main/java/com/hbm/explosion/vanillant/IPlayerProcessor.java rename to src/main/java/com/hbm/explosion/vanillant/interfaces/IPlayerProcessor.java index 9d76fb508..e39a5f57c 100644 --- a/src/main/java/com/hbm/explosion/vanillant/IPlayerProcessor.java +++ b/src/main/java/com/hbm/explosion/vanillant/interfaces/IPlayerProcessor.java @@ -1,7 +1,9 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.interfaces; import java.util.HashMap; +import com.hbm.explosion.vanillant.ExplosionVNT; + import net.minecraft.entity.player.EntityPlayer; import net.minecraft.util.Vec3; import net.minecraft.world.World; diff --git a/src/main/java/com/hbm/explosion/vanillant/BlockAllocatorStandard.java b/src/main/java/com/hbm/explosion/vanillant/standard/BlockAllocatorStandard.java similarity index 94% rename from src/main/java/com/hbm/explosion/vanillant/BlockAllocatorStandard.java rename to src/main/java/com/hbm/explosion/vanillant/standard/BlockAllocatorStandard.java index 062626bbe..f84cc5728 100644 --- a/src/main/java/com/hbm/explosion/vanillant/BlockAllocatorStandard.java +++ b/src/main/java/com/hbm/explosion/vanillant/standard/BlockAllocatorStandard.java @@ -1,7 +1,10 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.standard; import java.util.HashSet; +import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.interfaces.IBlockAllocator; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.util.MathHelper; diff --git a/src/main/java/com/hbm/explosion/vanillant/BlockProcessorStandard.java b/src/main/java/com/hbm/explosion/vanillant/standard/BlockProcessorStandard.java similarity index 76% rename from src/main/java/com/hbm/explosion/vanillant/BlockProcessorStandard.java rename to src/main/java/com/hbm/explosion/vanillant/standard/BlockProcessorStandard.java index b84ee3360..2b6d4f659 100644 --- a/src/main/java/com/hbm/explosion/vanillant/BlockProcessorStandard.java +++ b/src/main/java/com/hbm/explosion/vanillant/standard/BlockProcessorStandard.java @@ -1,8 +1,14 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.standard; import java.util.HashSet; import java.util.Iterator; +import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.interfaces.IBlockMutator; +import com.hbm.explosion.vanillant.interfaces.IBlockProcessor; +import com.hbm.explosion.vanillant.interfaces.IDropChanceMutator; +import com.hbm.explosion.vanillant.interfaces.IFortuneMutator; + import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.world.ChunkPosition; @@ -79,11 +85,20 @@ public class BlockProcessorStandard implements IBlockProcessor { } public BlockProcessorStandard setNoDrop() { - this.chance = new DropChanceNever(); + this.chance = new DropChanceMutatorStandard(0F); return this; } public BlockProcessorStandard setAllDrop() { - this.chance = new DropChanceAlways(); + this.chance = new DropChanceMutatorStandard(1F); + return this; + } + public BlockProcessorStandard setFortune(int fortune) { + this.fortune = new IFortuneMutator() { //no standard class because we only have one case thus far + @Override + public int mutateFortune(ExplosionVNT explosion, Block block, int x, int y, int z) { + return fortune; + } + }; return this; } } diff --git a/src/main/java/com/hbm/explosion/vanillant/standard/DropChanceMutatorStandard.java b/src/main/java/com/hbm/explosion/vanillant/standard/DropChanceMutatorStandard.java new file mode 100644 index 000000000..d0526d89f --- /dev/null +++ b/src/main/java/com/hbm/explosion/vanillant/standard/DropChanceMutatorStandard.java @@ -0,0 +1,20 @@ +package com.hbm.explosion.vanillant.standard; + +import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.interfaces.IDropChanceMutator; + +import net.minecraft.block.Block; + +public class DropChanceMutatorStandard implements IDropChanceMutator { + + private float chance; + + public DropChanceMutatorStandard(float chance) { + this.chance = chance; + } + + @Override + public float mutateDropChance(ExplosionVNT explosion, Block block, int x, int y, int z, float chance) { + return this.chance; + } +} diff --git a/src/main/java/com/hbm/explosion/vanillant/EntityProcessorStandard.java b/src/main/java/com/hbm/explosion/vanillant/standard/EntityProcessorStandard.java similarity index 94% rename from src/main/java/com/hbm/explosion/vanillant/EntityProcessorStandard.java rename to src/main/java/com/hbm/explosion/vanillant/standard/EntityProcessorStandard.java index 0dbaac088..f9fbdb272 100644 --- a/src/main/java/com/hbm/explosion/vanillant/EntityProcessorStandard.java +++ b/src/main/java/com/hbm/explosion/vanillant/standard/EntityProcessorStandard.java @@ -1,8 +1,11 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.standard; import java.util.HashMap; import java.util.List; +import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.interfaces.IEntityProcessor; + import net.minecraft.enchantment.EnchantmentProtection; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/hbm/explosion/vanillant/ExplosionEffectStandard.java b/src/main/java/com/hbm/explosion/vanillant/standard/ExplosionEffectStandard.java similarity index 93% rename from src/main/java/com/hbm/explosion/vanillant/ExplosionEffectStandard.java rename to src/main/java/com/hbm/explosion/vanillant/standard/ExplosionEffectStandard.java index 57ecffb9f..1ffb85b24 100644 --- a/src/main/java/com/hbm/explosion/vanillant/ExplosionEffectStandard.java +++ b/src/main/java/com/hbm/explosion/vanillant/standard/ExplosionEffectStandard.java @@ -1,7 +1,9 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.standard; import java.util.List; +import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.interfaces.IExplosionSFX; import com.hbm.packet.ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/explosion/vanillant/PlayerProcessorStandard.java b/src/main/java/com/hbm/explosion/vanillant/standard/PlayerProcessorStandard.java similarity index 83% rename from src/main/java/com/hbm/explosion/vanillant/PlayerProcessorStandard.java rename to src/main/java/com/hbm/explosion/vanillant/standard/PlayerProcessorStandard.java index 4a1703d67..186ea3b85 100644 --- a/src/main/java/com/hbm/explosion/vanillant/PlayerProcessorStandard.java +++ b/src/main/java/com/hbm/explosion/vanillant/standard/PlayerProcessorStandard.java @@ -1,8 +1,10 @@ -package com.hbm.explosion.vanillant; +package com.hbm.explosion.vanillant.standard; import java.util.HashMap; import java.util.Map.Entry; +import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.interfaces.IPlayerProcessor; import com.hbm.packet.ExplosionKnockbackPacket; import com.hbm.packet.PacketDispatcher; diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index ee938754f..052f76f67 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -50,7 +50,7 @@ import com.hbm.entity.mob.botprime.*; import com.hbm.entity.mob.siege.*; import com.hbm.entity.particle.*; import com.hbm.entity.projectile.*; -import com.hbm.explosion.vanillant.ExplosionEffectStandard; +import com.hbm.explosion.vanillant.standard.ExplosionEffectStandard; import com.hbm.handler.HbmKeybinds; import com.hbm.handler.HbmKeybinds.EnumKeybind; import com.hbm.items.ModItems; diff --git a/src/main/java/com/hbm/packet/ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket.java b/src/main/java/com/hbm/packet/ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket.java index 4810fa151..c8300a0da 100644 --- a/src/main/java/com/hbm/packet/ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket.java +++ b/src/main/java/com/hbm/packet/ExplosionVanillaNewTechnologyCompressedAffectedBlockPositionDataForClientEffectsAndParticleHandlingPacket.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; -import com.hbm.explosion.vanillant.ExplosionEffectStandard; +import com.hbm.explosion.vanillant.standard.ExplosionEffectStandard; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;