Skip to content

Commit

Permalink
add Rock entity
Browse files Browse the repository at this point in the history
  • Loading branch information
stpv221 authored Jun 4, 2024
1 parent d8eb503 commit ff5d1b8
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ public EntityIceball(World worldIn, double x, double y, double z) {
*/
protected void onImpact(MovingObjectPosition parMovingObjectPosition) {
if (parMovingObjectPosition.entityHit != null) {
byte b0 = 3;
byte b0 = 5;
if (parMovingObjectPosition.entityHit instanceof EntityBlaze) {
b0 = 5;
b0 = 7;
}

parMovingObjectPosition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()),
Expand Down
66 changes: 66 additions & 0 deletions src/main/java/net/minecraft/entity/projectile/EntityRock.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
package net.minecraft.entity.projectile;

import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntityIronGolem;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;

/**+
* This portion of EaglercraftX contains deobfuscated Minecraft 1.8 source code.
*
* Minecraft 1.8.8 bytecode is (c) 2015 Mojang AB. "Do not distribute!"
* Mod Coder Pack v9.18 deobfuscation configs are (c) Copyright by the MCP Team
*
* EaglercraftX 1.8 patch files (c) 2022-2024 lax1dude, ayunami2000. All Rights Reserved.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
* IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
* INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
*/
public class EntityRock extends EntityThrowable {
public EntityRock(World worldIn) {
super(worldIn);
}

public EntityRock(World worldIn, EntityLivingBase throwerIn) {
super(worldIn, throwerIn);
}

public EntityRock(World worldIn, double x, double y, double z) {
super(worldIn, x, y, z);
}

/**+
* Called when this EntityThrowable hits a block or entity.
*/
protected void onImpact(MovingObjectPosition parMovingObjectPosition) {
if (parMovingObjectPosition.entityHit != null) {
byte b0 = 5;
if (parMovingObjectPosition.entityHit instanceof EntityIronGolem) {
b0 = 7;
}

parMovingObjectPosition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()),
(float) b0);
}

for (int i = 0; i < 8; ++i) {
this.worldObj.spawnParticle(EnumParticleTypes.SNOWBALL, this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D,
new int[0]);
}

if (!this.worldObj.isRemote) {
this.setDead();
}
}
}
4 changes: 2 additions & 2 deletions src/main/java/net/minecraft/item/ItemRock.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntitySnowball;
import net.minecraft.entity.projectile.EntityRock;
import net.minecraft.stats.StatList;
import net.minecraft.world.World;

Expand Down Expand Up @@ -43,7 +43,7 @@ public ItemStack onItemRightClick(ItemStack itemstack, World world, EntityPlayer

world.playSoundAtEntity(entityplayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
if (!world.isRemote) {
world.spawnEntityInWorld(new EntitySnowball(world, entityplayer));
world.spawnEntityInWorld(new EntityRock(world, entityplayer));
}

entityplayer.triggerAchievement(StatList.objectUseStats[Item.getIdFromItem(this)]);
Expand Down

0 comments on commit ff5d1b8

Please sign in to comment.