Merge pull request #1185 from 70000hp/bomber-fixes

Bomber Fixes
This commit is contained in:
HbmMods 2023-09-06 15:22:11 +02:00 committed by GitHub
commit 2e5fc5e86a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 96 additions and 80 deletions

View File

@ -7,6 +7,7 @@ import com.hbm.lib.Library;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import com.hbm.world.WorldUtil;
import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@ -16,101 +17,81 @@ import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
public class ItemBombCaller extends Item {
public ItemBombCaller() {
super();
this.setHasSubtypes(true);
this.setHasSubtypes(true);
}
@Override
public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool)
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean bool)
{
list.add("Aim & click to call an airstrike!");
if(itemstack.getItemDamage() == 0)
list.add("Type: Carpet bombing");
if(itemstack.getItemDamage() == 1)
list.add("Type: Napalm");
if(itemstack.getItemDamage() == 2)
list.add("Type: Poison gas");
if(itemstack.getItemDamage() == 3)
list.add("Type: Agent orange");
if(itemstack.getItemDamage() == 4)
list.add("Type: Atomic bomb");
if(itemstack.getItemDamage() == 5)
list.add("Type: VT stinger rockets");
if(itemstack.getItemDamage() == 6)
list.add("Type: PIP OH GOD");
if(itemstack.getItemDamage() == 7)
list.add("Type: Cloud the cloud oh god the cloud");
switch (stack.getItemDamage()) {
case 0: list.add("Type: Carpet bombing"); break;
case 1: list.add("Type: Napalm"); break;
case 2: list.add("Type: Poison gas"); break;
case 3: list.add("Type: Agent orange"); break;
case 4: list.add("Type: Atomic bomb"); break;
case 5: list.add("Type: VT stinger rockets"); break;
case 6: list.add("Type: PIP OH GOD"); break;
case 7: list.add("Type: Cloud the cloud oh god the cloud"); break;
default: list.add("Type: INVALID, Report it to mod creator");
}
}
@Override
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
{
public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)
{
MovingObjectPosition pos = Library.rayTrace(player, 500, 1);
int x = pos.blockX;
int y = pos.blockY;
int z = pos.blockZ;
boolean b = false;
if(!world.isRemote)
if(!world.isRemote)
{
EntityBomber bomber;
switch(stack.getItemDamage()) {
case 1: bomber = EntityBomber.statFacNapalm(world, x, y, z); break;
case 2: bomber = EntityBomber.statFacChlorine(world, x, y, z); break;
case 3: bomber = EntityBomber.statFacOrange(world, x, y, z); break;
case 4: bomber = EntityBomber.statFacABomb(world, x, y, z); break;
case 5: bomber = EntityBomber.statFacStinger(world, x, y, z); break;
case 6: bomber = EntityBomber.statFacBoxcar(world, x, y, z); break;
case 7: bomber = EntityBomber.statFacPC(world, x, y, z); break;
default: bomber = EntityBomber.statFacCarpet(world, x, y, z);
}
WorldUtil.loadAndSpawnEntityInWorld(bomber);
player.addChatMessage(new ChatComponentText("Called in airstrike!"));
world.playSoundAtEntity(player, "hbm:item.techBleep", 1.0F, 1.0F);
if(stack.getItemDamage() == 0)
if(world.spawnEntityInWorld(EntityBomber.statFacCarpet(world, x, y, z)))
b = true;
if(stack.getItemDamage() == 1)
if(world.spawnEntityInWorld(EntityBomber.statFacNapalm(world, x, y, z)))
b = true;
if(stack.getItemDamage() == 2)
if(world.spawnEntityInWorld(EntityBomber.statFacChlorine(world, x, y, z)))
b = true;
if(stack.getItemDamage() == 3)
if(world.spawnEntityInWorld(EntityBomber.statFacOrange(world, x, y, z)))
b = true;
if(stack.getItemDamage() == 4)
if(world.spawnEntityInWorld(EntityBomber.statFacABomb(world, x, y, z)))
b = true;
if(stack.getItemDamage() == 5)
if(world.spawnEntityInWorld(EntityBomber.statFacStinger(world, x, y, z)))
b = true;
if(stack.getItemDamage() == 6)
if(world.spawnEntityInWorld(EntityBomber.statFacBoxcar(world, x, y, z)))
b = true;
if(stack.getItemDamage() == 7)
if(world.spawnEntityInWorld(EntityBomber.statFacPC(world, x, y, z)))
b = true;
if(b) {
player.addChatMessage(new ChatComponentText("Called in airstrike!"));
world.playSoundAtEntity(player, "hbm:item.techBleep", 1.0F, 1.0F);
} else {
world.playSoundAtEntity(player, "hbm:item.techBoop", 1.0F, 1.0F);
}
}
stack.stackSize -= b ? 1 : 0;
return stack;
}
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_)
{
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 0));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 1));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 2));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 3));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 4));
}
@Override
stack.stackSize -= 1;
return stack;
}
@Override
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack p_77636_1_)
{
return p_77636_1_.getItemDamage() >= 4;
}
public void getSubItems(Item p_150895_1_, CreativeTabs p_150895_2_, List p_150895_3_)
{
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 0));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 1));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 2));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 3));
p_150895_3_.add(new ItemStack(p_150895_1_, 1, 4));
}
@Override
@SideOnly(Side.CLIENT)
public boolean hasEffect(ItemStack p_77636_1_)
{
return p_77636_1_.getItemDamage() >= 4;
}
}

View File

@ -2,12 +2,15 @@ package com.hbm.world;
import com.hbm.packet.BiomeSyncPacket;
import com.hbm.packet.PacketDispatcher;
import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
import net.minecraft.entity.Entity;
import net.minecraft.util.MathHelper;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.Chunk;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.entity.EntityJoinWorldEvent;
public class WorldUtil {
@ -31,6 +34,38 @@ public class WorldUtil {
PacketDispatcher.wrapper.sendToAllAround(new BiomeSyncPacket(coord.chunkXPos, coord.chunkZPos, chunk.getBiomeArray()), new TargetPoint(world.provider.dimensionId, coord.getCenterXPos(), 128, coord.getCenterZPosition() /* who named you? */, 1024D));
}
/**Chunkloads the chunk the entity is going to spawn in and then spawns it
* @param entity The entity to be spawned**/
/*fun fact: this is based off of joinEntityInSurroundings in World
however, since mojang is staffed by field mice, that function is client side only and half-baked
*/
public static void loadAndSpawnEntityInWorld(Entity entity) {
World world = entity.worldObj;
int chunkX = MathHelper.floor_double(entity.posX / 16.0D);
int chunkZ = MathHelper.floor_double(entity.posZ / 16.0D);
byte loadRadius = 2;
for (int k = chunkX - loadRadius; k <= chunkX + loadRadius; ++k)
{
for (int l = chunkZ - loadRadius; l <= chunkZ + loadRadius; ++l)
{
world.getChunkFromChunkCoords(k, l);
}
}
if (!world.loadedEntityList.contains(entity))
{
if (!MinecraftForge.EVENT_BUS.post(new EntityJoinWorldEvent(entity, world)))
{
world.getChunkFromChunkCoords(chunkX, chunkZ).addEntity(entity);
world.loadedEntityList.add(entity);
world.onEntityAdded(entity);
}
}
}
public static void syncBiomeChange(World world, int x, int z) {
Chunk chunk = world.getChunkFromBlockCoords(x, z);
byte biome = chunk.getBiomeArray()[(z & 15) << 4 | (x & 15)];