Updated to the latest Forge
This commit is contained in:
parent
c2d642f87b
commit
13ef3f8e0a
|
@ -1,4 +1,4 @@
|
|||
minecraft_version=1.9
|
||||
forge_version=12.16.0.1770-1.9
|
||||
forge_version=12.16.0.1807-1.9
|
||||
mod_version=4.0.0
|
||||
mappings_version=snapshot_nodoc_20160318
|
|
@ -50,7 +50,7 @@ public class GameplayConfigurationHandler
|
|||
@SubscribeEvent
|
||||
public void onConfigurationChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event)
|
||||
{
|
||||
if (event.modID.equalsIgnoreCase(BiomesOPlenty.MOD_ID))
|
||||
if (event.getModID().equalsIgnoreCase(BiomesOPlenty.MOD_ID))
|
||||
{
|
||||
loadConfiguration();
|
||||
}
|
||||
|
|
|
@ -76,7 +76,7 @@ public class MiscConfigurationHandler
|
|||
@SubscribeEvent
|
||||
public void onConfigurationChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event)
|
||||
{
|
||||
if (event.modID.equalsIgnoreCase(BiomesOPlenty.MOD_ID))
|
||||
if (event.getModID().equalsIgnoreCase(BiomesOPlenty.MOD_ID))
|
||||
{
|
||||
loadConfiguration();
|
||||
}
|
||||
|
|
|
@ -92,7 +92,7 @@ public class EntityButterfly extends EntityFlying implements IMob {
|
|||
|
||||
public int getButterflyType()
|
||||
{
|
||||
return this.dataWatcher.get(TYPE);
|
||||
return (int) this.dataWatcher.get(TYPE);
|
||||
}
|
||||
|
||||
public void setButterflyType(int butterflyTypeId)
|
||||
|
|
|
@ -159,12 +159,12 @@ public class AchievementEventHandler
|
|||
@SubscribeEvent
|
||||
public void onItemUsed(LivingEntityUseItemEvent.Finish event)
|
||||
{
|
||||
ItemStack stack = event.item;
|
||||
ItemStack stack = event.getItem();
|
||||
Item item = stack.getItem();
|
||||
|
||||
if (event.entity instanceof EntityPlayer)
|
||||
if (event.getEntity() instanceof EntityPlayer)
|
||||
{
|
||||
EntityPlayer player = (EntityPlayer)event.entityLiving;
|
||||
EntityPlayer player = (EntityPlayer)event.getEntityLiving();
|
||||
|
||||
//Trippin'
|
||||
if (item == BOPItems.shroompowder) {
|
||||
|
@ -176,7 +176,7 @@ public class AchievementEventHandler
|
|||
@SubscribeEvent
|
||||
public void onBlockPlaced(BlockEvent.PlaceEvent event)
|
||||
{
|
||||
ItemStack stack = event.itemInHand;
|
||||
ItemStack stack = event.getItemInHand();
|
||||
|
||||
//Blocks can be placed by things other than players
|
||||
if (stack != null)
|
||||
|
@ -188,7 +188,7 @@ public class AchievementEventHandler
|
|||
//Yggdrasil
|
||||
if (state == BlockBOPSapling.paging.getVariantState(BOPTrees.SACRED_OAK))
|
||||
{
|
||||
event.player.addStat(BOPAchievements.grow_sacred_oak);
|
||||
event.getPlayer().addStat(BOPAchievements.grow_sacred_oak);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -35,8 +35,8 @@ public class BucketEventHandler
|
|||
if (event.getEmptyBucket().getItem() != Items.bucket) {return;}
|
||||
if (event.getTarget() == null || event.getTarget().typeOfHit != RayTraceResult.Type.BLOCK) {return;}
|
||||
BlockPos blockpos = event.getTarget().getBlockPos();
|
||||
if (!event.getWorld().isBlockModifiable(event.entityPlayer, blockpos)) {return;}
|
||||
if (!event.entityPlayer.canPlayerEdit(blockpos.offset(event.getTarget().sideHit), event.getTarget().sideHit, event.getEmptyBucket())) {return;}
|
||||
if (!event.getWorld().isBlockModifiable(event.getEntityPlayer(), blockpos)) {return;}
|
||||
if (!event.getEntityPlayer().canPlayerEdit(blockpos.offset(event.getTarget().sideHit), event.getTarget().sideHit, event.getEmptyBucket())) {return;}
|
||||
|
||||
// determine if the block is one of our BOP fluids
|
||||
IBlockState iblockstate = event.getWorld().getBlockState(blockpos);
|
||||
|
|
|
@ -24,7 +24,7 @@ public class DyeEventHandler
|
|||
@SubscribeEvent
|
||||
public void entityInteract(EntityInteractEvent event)
|
||||
{
|
||||
ItemStack stack = event.entityPlayer.getHeldItem(event.getHand());
|
||||
ItemStack stack = event.getEntityPlayer().getHeldItem(event.getHand());
|
||||
if (stack == null) {return;}
|
||||
|
||||
Item item = stack.getItem();
|
||||
|
@ -43,7 +43,7 @@ public class DyeEventHandler
|
|||
if (dyeColor != wolf.getCollarColor())
|
||||
{
|
||||
wolf.setCollarColor(dyeColor);
|
||||
if (!event.entityPlayer.capabilities.isCreativeMode) {--stack.stackSize;}
|
||||
if (!event.getEntityPlayer().capabilities.isCreativeMode) {--stack.stackSize;}
|
||||
event.setResult(Result.ALLOW);
|
||||
}
|
||||
}
|
||||
|
@ -53,7 +53,7 @@ public class DyeEventHandler
|
|||
if (!sheep.getSheared() && dyeColor != sheep.getFleeceColor())
|
||||
{
|
||||
sheep.setFleeceColor(dyeColor);
|
||||
if (!event.entityPlayer.capabilities.isCreativeMode) {--stack.stackSize;}
|
||||
if (!event.getEntityPlayer().capabilities.isCreativeMode) {--stack.stackSize;}
|
||||
event.setResult(Result.ALLOW);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -11,28 +11,9 @@ public class FlippersEventHandler
|
|||
@SubscribeEvent
|
||||
public void onLivingUpdate(LivingUpdateEvent event)
|
||||
{
|
||||
/* TODO: surely just holding flippers shouldn't give you the swimming bonus, surely you have to put them on your feet? - commented this out for now
|
||||
if (event.entity instanceof EntityLiving)
|
||||
if (event.getEntity() instanceof EntityPlayer)
|
||||
{
|
||||
EntityLiving entity = (EntityLiving)event.entity;
|
||||
|
||||
ItemStack itemstack = entity.getEquipmentInSlot(1);
|
||||
|
||||
if (entity.isInWater())
|
||||
{
|
||||
if (itemstack != null && itemstack.getItem() == BOPItems.flippers)
|
||||
{
|
||||
entity.motionX *= 1.125D;
|
||||
entity.motionY *= 1.1D;
|
||||
entity.motionZ *= 1.125D;
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
|
||||
if (event.entity instanceof EntityPlayer)
|
||||
{
|
||||
EntityPlayer player = (EntityPlayer)event.entity;
|
||||
EntityPlayer player = (EntityPlayer)event.getEntity();
|
||||
|
||||
InventoryPlayer inventory = player.inventory;
|
||||
|
||||
|
|
|
@ -23,7 +23,7 @@ public class GuiEventHandler
|
|||
@SubscribeEvent
|
||||
public void onPreInitCreateWorld(InitGuiEvent.Pre event)
|
||||
{
|
||||
GuiScreen screenGui = event.gui;
|
||||
GuiScreen screenGui = event.getGui();
|
||||
|
||||
if (MiscConfigurationHandler.useBoPWorldTypeDefault && screenGui instanceof GuiCreateWorld)
|
||||
{
|
||||
|
|
|
@ -19,8 +19,8 @@ public class ItemEventHandler
|
|||
@SubscribeEvent
|
||||
public void onItemToss(ItemTossEvent event)
|
||||
{
|
||||
EntityPlayer player = event.player;
|
||||
ItemStack stack = event.entityItem.getEntityItem();
|
||||
EntityPlayer player = event.getPlayer();
|
||||
ItemStack stack = event.getEntityItem().getEntityItem();
|
||||
|
||||
if (player.openContainer instanceof ContainerFlowerBasket)
|
||||
{
|
||||
|
@ -40,10 +40,10 @@ public class ItemEventHandler
|
|||
@SubscribeEvent
|
||||
public void onItemPickup(EntityItemPickupEvent event)
|
||||
{
|
||||
EntityPlayer player = event.entityPlayer;
|
||||
EntityItem entityItem = event.item;
|
||||
EntityPlayer player = event.getEntityPlayer();
|
||||
EntityItem entityItem = event.getItem();
|
||||
|
||||
ItemStack stack = event.item.getEntityItem();
|
||||
ItemStack stack = event.getItem().getEntityItem();
|
||||
ItemStack basketStack = ItemFlowerBasket.findBasketStack(player);
|
||||
|
||||
if (!player.worldObj.isRemote)
|
||||
|
|
|
@ -34,8 +34,8 @@ public class UseHoeEventHandler
|
|||
return;
|
||||
}
|
||||
|
||||
World world = event.world;
|
||||
BlockPos pos = event.pos;
|
||||
World world = event.getWorld();
|
||||
BlockPos pos = event.getPos();
|
||||
IBlockState state = world.getBlockState(pos);
|
||||
Block block = state.getBlock();
|
||||
boolean result = false;
|
||||
|
@ -70,12 +70,12 @@ public class UseHoeEventHandler
|
|||
|
||||
if (result)
|
||||
{
|
||||
if (!event.entityPlayer.capabilities.isCreativeMode)
|
||||
if (!event.getEntityPlayer().capabilities.isCreativeMode)
|
||||
{
|
||||
event.current.damageItem(1, event.entityLiving);
|
||||
event.getCurrent().damageItem(1, event.getEntityLiving());
|
||||
}
|
||||
event.world.playSound(event.entityPlayer, (double) ((float) pos.getX() + 0.5F), (double) ((float) pos.getY() + 0.5F), (double) ((float) pos.getZ() + 0.5F), block.getSoundType().getStepSound(), SoundCategory.BLOCKS, (state.getBlock().getSoundType().getVolume() + 1.0F) / 2.0F, state.getBlock().getSoundType().getPitch() * 0.8F);
|
||||
event.entityPlayer.swingArm(PlayerUtil.getHandForItem(event.entityPlayer, event.current));
|
||||
event.getWorld().playSound(event.getEntityPlayer(), (double) ((float) pos.getX() + 0.5F), (double) ((float) pos.getY() + 0.5F), (double) ((float) pos.getZ() + 0.5F), block.getSoundType().getStepSound(), SoundCategory.BLOCKS, (state.getBlock().getSoundType().getVolume() + 1.0F) / 2.0F, state.getBlock().getSoundType().getPitch() * 0.8F);
|
||||
event.getEntityPlayer().swingArm(PlayerUtil.getHandForItem(event.getEntityPlayer(), event.getCurrent()));
|
||||
}
|
||||
}
|
||||
}
|
|
@ -29,21 +29,21 @@ public class DecorateBiomeEventHandler
|
|||
@SubscribeEvent
|
||||
public void onPreBiomeDecorate(DecorateBiomeEvent.Pre event)
|
||||
{
|
||||
if (BOPBiomes.excludedDecoratedWorldTypes.contains(event.world.getWorldType()))
|
||||
if (BOPBiomes.excludedDecoratedWorldTypes.contains(event.getWorld().getWorldType()))
|
||||
return;
|
||||
|
||||
runGeneratorStage(event.world, event.rand, event.pos, GeneratorStage.PRE);
|
||||
runGeneratorStage(event.getWorld(), event.getRand(), event.getPos(), GeneratorStage.PRE);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onBiomeDecorate(DecorateBiomeEvent.Decorate event)
|
||||
{
|
||||
if (BOPBiomes.excludedDecoratedWorldTypes.contains(event.world.getWorldType()))
|
||||
if (BOPBiomes.excludedDecoratedWorldTypes.contains(event.getWorld().getWorldType()))
|
||||
return;
|
||||
|
||||
if (event.type != Decorate.EventType.CUSTOM)
|
||||
if (event.getType() != Decorate.EventType.CUSTOM)
|
||||
{
|
||||
boolean allow = runGeneratorStage(event.world, event.rand, event.pos, GeneratorStage.mapDecorateType(event.type));
|
||||
boolean allow = runGeneratorStage(event.getWorld(), event.getRand(), event.getPos(), GeneratorStage.mapDecorateType(event.getType()));
|
||||
|
||||
event.setResult(allow ? Result.ALLOW : Result.DENY);
|
||||
}
|
||||
|
@ -52,28 +52,28 @@ public class DecorateBiomeEventHandler
|
|||
@SubscribeEvent
|
||||
public void onPostBiomeDecorate(DecorateBiomeEvent.Post event)
|
||||
{
|
||||
if (BOPBiomes.excludedDecoratedWorldTypes.contains(event.world.getWorldType()))
|
||||
if (BOPBiomes.excludedDecoratedWorldTypes.contains(event.getWorld().getWorldType()))
|
||||
return;
|
||||
|
||||
runGeneratorStage(event.world, event.rand, event.pos, GeneratorStage.POST);
|
||||
runGeneratorStage(event.getWorld(), event.getRand(), event.getPos(), GeneratorStage.POST);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onPreGenerateOres(OreGenEvent.Pre event)
|
||||
{
|
||||
if (BOPBiomes.excludedDecoratedWorldTypes.contains(event.world.getWorldType()))
|
||||
if (BOPBiomes.excludedDecoratedWorldTypes.contains(event.getWorld().getWorldType()))
|
||||
return;
|
||||
|
||||
runGeneratorStage(event.world, event.rand, event.pos, GeneratorStage.ORE_PRE);
|
||||
runGeneratorStage(event.getWorld(), event.getRand(), event.getPos(), GeneratorStage.ORE_PRE);
|
||||
}
|
||||
|
||||
@SubscribeEvent
|
||||
public void onPostGenerateOres(OreGenEvent.Post event)
|
||||
{
|
||||
if (BOPBiomes.excludedDecoratedWorldTypes.contains(event.world.getWorldType()))
|
||||
if (BOPBiomes.excludedDecoratedWorldTypes.contains(event.getWorld().getWorldType()))
|
||||
return;
|
||||
|
||||
runGeneratorStage(event.world, event.rand, event.pos, GeneratorStage.ORE_POST);
|
||||
runGeneratorStage(event.getWorld(), event.getRand(), event.getPos(), GeneratorStage.ORE_POST);
|
||||
}
|
||||
|
||||
private static boolean runGeneratorStage(World world, Random random, BlockPos pos, GeneratorStage stage)
|
||||
|
|
|
@ -22,9 +22,9 @@ public class PotionParalysisEventHandler
|
|||
public void onEntityUpdate(LivingUpdateEvent event)
|
||||
{
|
||||
|
||||
if (event.entityLiving.isPotionActive(BOPPotions.paralysis))
|
||||
if (event.getEntityLiving().isPotionActive(BOPPotions.paralysis))
|
||||
{
|
||||
EntityLivingBase entity = event.entityLiving;
|
||||
EntityLivingBase entity = event.getEntityLiving();
|
||||
|
||||
entity.motionX = 0.0;
|
||||
|
||||
|
@ -51,7 +51,7 @@ public class PotionParalysisEventHandler
|
|||
@SubscribeEvent
|
||||
public void onEndermanTP(EnderTeleportEvent event)
|
||||
{
|
||||
if (event.entityLiving.isPotionActive(BOPPotions.paralysis))
|
||||
if (event.getEntityLiving().isPotionActive(BOPPotions.paralysis))
|
||||
{
|
||||
event.setCanceled(true);
|
||||
}
|
||||
|
|
|
@ -20,9 +20,9 @@ public class PotionPossessionEventHandler
|
|||
@SubscribeEvent
|
||||
public void onEntityUpdate(LivingUpdateEvent event)
|
||||
{
|
||||
if (event.entityLiving.isPotionActive(BOPPotions.possession))
|
||||
if (event.getEntityLiving().isPotionActive(BOPPotions.possession))
|
||||
{
|
||||
EntityLivingBase entity = event.entityLiving;
|
||||
EntityLivingBase entity = event.getEntityLiving();
|
||||
|
||||
Random rand = entity.worldObj.rand;
|
||||
|
||||
|
|
Loading…
Reference in New Issue