From d8fe6d21bd81256f5e9b0ae438adcf100575062a Mon Sep 17 00:00:00 2001 From: Nick Date: Mon, 21 Mar 2016 12:55:36 -0700 Subject: [PATCH] Update Forge + Mappings --- gradle.properties | 4 ++-- .../bloodmagic/block/BlockBloodRune.java | 2 +- .../block/BlockBloodStoneBrick.java | 2 +- .../bloodmagic/block/BlockBloodTank.java | 2 +- .../bloodmagic/block/BlockCrystal.java | 2 +- .../WayofTime/bloodmagic/block/BlockPath.java | 2 +- .../block/BlockRitualController.java | 2 +- .../bloodmagic/block/BlockRitualStone.java | 2 +- .../bloodmagic/block/BlockSoulForge.java | 2 +- .../bloodmagic/item/soul/ItemSentientBow.java | 22 +++++++++---------- .../bloodmagic/proxy/ClientProxy.java | 2 +- .../container/ContainerItemRoutingNode.java | 6 ++--- .../bloodmagic/util/handler/EventHandler.java | 2 +- 13 files changed, 26 insertions(+), 26 deletions(-) diff --git a/gradle.properties b/gradle.properties index 49d9b647..51147205 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,10 +2,10 @@ mod_name=BloodMagic package_group=com.wayoftime.bloodmagic mod_version=2.0.0 mc_version=1.9 -forge_version=12.16.0.1770-1.9 +forge_version=12.16.0.1782-1.9 curse_id=224791 -mappings_version=snapshot_20160312 +mappings_version=snapshot_20160321 jei_version=3.0.0.158 waila_version=1.6.0-B3 diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java index 2808e0c4..9e242018 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java @@ -24,7 +24,7 @@ public class BlockBloodRune extends BlockString implements IVariantProvider setUnlocalizedName(Constants.Mod.MODID + ".rune."); setRegistryName(Constants.BloodMagicBlock.BLOOD_RUNE.getRegName()); setCreativeTab(BloodMagic.tabBloodMagic); - setStepSound(SoundType.STONE); + setSoundType(SoundType.STONE); setHardness(2.0F); setResistance(5.0F); setHarvestLevel("pickaxe", 2); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java index 704c3aac..bddc0f21 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java @@ -26,7 +26,7 @@ public class BlockBloodStoneBrick extends BlockString implements IVariantProvide setCreativeTab(BloodMagic.tabBloodMagic); setHardness(2.0F); setResistance(5.0F); - setStepSound(SoundType.STONE); + setSoundType(SoundType.STONE); setHarvestLevel("pickaxe", 2); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java index 022b1abc..b7df85c1 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java @@ -36,7 +36,7 @@ public class BlockBloodTank extends BlockContainer setRegistryName(Constants.BloodMagicBlock.BLOOD_TANK.getRegName()); setHardness(2.0F); setResistance(5.0F); - setStepSound(SoundType.GLASS); + setSoundType(SoundType.GLASS); setHarvestLevel("pickaxe", 1); setCreativeTab(BloodMagic.tabBloodMagic); } diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java index 20451a8c..00159f55 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java @@ -24,7 +24,7 @@ public class BlockCrystal extends BlockString implements IVariantProvider setUnlocalizedName(Constants.Mod.MODID + ".crystal."); setRegistryName(Constants.BloodMagicBlock.CRYSTAL.getRegName()); setCreativeTab(BloodMagic.tabBloodMagic); - setStepSound(SoundType.STONE); + setSoundType(SoundType.STONE); setHardness(2.0F); setResistance(5.0F); setHarvestLevel("pickaxe", 2); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java index 337d2b6a..604ad4e8 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockPath.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockPath.java @@ -31,7 +31,7 @@ public class BlockPath extends BlockString implements IIncensePath, IVariantProv setCreativeTab(BloodMagic.tabBloodMagic); setHardness(2.0F); setResistance(5.0F); - setStepSound(SoundType.STONE); + setSoundType(SoundType.STONE); setHarvestLevel("axe", 0, getStateFromMeta(0)); setHarvestLevel("axe", 0, getStateFromMeta(1)); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java index 6e05d88b..95797d4f 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java @@ -43,7 +43,7 @@ public class BlockRitualController extends BlockStringContainer implements IVari setUnlocalizedName(Constants.Mod.MODID + ".stone.ritual."); setRegistryName(Constants.BloodMagicBlock.RITUAL_CONTROLLER.getRegName()); setCreativeTab(BloodMagic.tabBloodMagic); - setStepSound(SoundType.STONE); + setSoundType(SoundType.STONE); setHardness(2.0F); setResistance(5.0F); setHarvestLevel("pickaxe", 2); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java index 9721002b..537b3cde 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java @@ -31,7 +31,7 @@ public class BlockRitualStone extends BlockString implements IRitualStone, IVari setUnlocalizedName(Constants.Mod.MODID + ".ritualStone."); setRegistryName(Constants.BloodMagicBlock.RITUAL_STONE.getRegName()); setCreativeTab(BloodMagic.tabBloodMagic); - setStepSound(SoundType.STONE); + setSoundType(SoundType.STONE); setHardness(2.0F); setResistance(5.0F); setHarvestLevel("pickaxe", 2); diff --git a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java index c746091c..b1813006 100644 --- a/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java +++ b/src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java @@ -38,7 +38,7 @@ public class BlockSoulForge extends BlockContainer implements IVariantProvider setRegistryName(Constants.BloodMagicBlock.SOUL_FORGE.getRegName()); setHardness(2.0F); setResistance(5.0F); - setStepSound(SoundType.METAL); + setSoundType(SoundType.METAL); setHarvestLevel("pickaxe", 1); setCreativeTab(BloodMagic.tabBloodMagic); } diff --git a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java index 0f0e68f0..8d17f723 100644 --- a/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java +++ b/src/main/java/WayofTime/bloodmagic/item/soul/ItemSentientBow.java @@ -76,20 +76,20 @@ public class ItemSentientBow extends ItemBow itemstack = new ItemStack(Items.arrow); } - float f = func_185059_b(i); + float arrowVelocity = getArrowVelocity(i); - if ((double) f >= 0.1D) + if ((double) arrowVelocity >= 0.1D) { boolean flag1 = flag && itemstack.getItem() instanceof ItemArrow; //Forge: Fix consuming custom arrows. if (!worldIn.isRemote) { //Need to do some stuffs - ItemArrow itemarrow = (ItemArrow) ((ItemArrow) (itemstack.getItem() instanceof ItemArrow ? itemstack.getItem() : Items.arrow)); - EntityArrow entityarrow = itemarrow.makeTippedArrow(worldIn, itemstack, entityplayer); - entityarrow.func_184547_a(entityplayer, entityplayer.rotationPitch, entityplayer.rotationYaw, 0.0F, f * 3.0F, 1.0F); + ItemArrow itemarrow = ((ItemArrow) (itemstack.getItem() instanceof ItemArrow ? itemstack.getItem() : Items.arrow)); + EntityArrow entityarrow = itemarrow.createArrow(worldIn, itemstack, entityplayer); + entityarrow.func_184547_a(entityplayer, entityplayer.rotationPitch, entityplayer.rotationYaw, 0.0F, arrowVelocity * 3.0F, 1.0F); - if (f == 1.0F) + if (arrowVelocity == 1.0F) { entityarrow.setIsCritical(true); } @@ -123,7 +123,7 @@ public class ItemSentientBow extends ItemBow worldIn.spawnEntityInWorld(entityarrow); } - worldIn.playSound((EntityPlayer) null, entityplayer.posX, entityplayer.posY, entityplayer.posZ, SoundEvents.entity_arrow_shoot, SoundCategory.NEUTRAL, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F); + worldIn.playSound(null, entityplayer.posX, entityplayer.posY, entityplayer.posZ, SoundEvents.entity_arrow_shoot, SoundCategory.NEUTRAL, 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + arrowVelocity * 0.5F); if (!flag1) { @@ -135,7 +135,7 @@ public class ItemSentientBow extends ItemBow } } - entityplayer.addStat(StatList.func_188057_b(this)); + entityplayer.addStat(StatList.getObjectUseStats(this)); } } } @@ -143,10 +143,10 @@ public class ItemSentientBow extends ItemBow protected ItemStack getFiredArrow(EntityPlayer player) { - if (this.func_185058_h_(player.getHeldItem(EnumHand.OFF_HAND))) + if (this.isArrow(player.getHeldItem(EnumHand.OFF_HAND))) { return player.getHeldItem(EnumHand.OFF_HAND); - } else if (this.func_185058_h_(player.getHeldItem(EnumHand.MAIN_HAND))) + } else if (this.isArrow(player.getHeldItem(EnumHand.MAIN_HAND))) { return player.getHeldItem(EnumHand.MAIN_HAND); } else @@ -155,7 +155,7 @@ public class ItemSentientBow extends ItemBow { ItemStack itemstack = player.inventory.getStackInSlot(i); - if (this.func_185058_h_(itemstack)) + if (this.isArrow(itemstack)) { return itemstack; } diff --git a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java index f351d449..068ec595 100644 --- a/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java +++ b/src/main/java/WayofTime/bloodmagic/proxy/ClientProxy.java @@ -60,7 +60,7 @@ public class ClientProxy extends CommonProxy renderHelper = new InventoryRenderHelper(Constants.Mod.DOMAIN); renderHelperV2 = new InventoryRenderHelperV2(Constants.Mod.DOMAIN); - OBJLoader.instance.addDomain(Constants.Mod.MODID); + OBJLoader.INSTANCE.addDomain(Constants.Mod.MODID); ModBlocks.initRenders(); ModItems.initRenders(); diff --git a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java index 5fcbdb21..363ecc96 100644 --- a/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java +++ b/src/main/java/WayofTime/bloodmagic/tile/container/ContainerItemRoutingNode.java @@ -59,7 +59,7 @@ public class ContainerItemRoutingNode extends Container * Overridden in order to handle ghost item slots. */ @Override - public ItemStack func_184996_a(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player) + public ItemStack slotClick(int slotId, int dragType, ClickType clickTypeIn, EntityPlayer player) { InventoryPlayer inventoryPlayer = player.inventory; // if (!player.worldObj.isRemote) @@ -87,7 +87,7 @@ public class ContainerItemRoutingNode extends Container { if (!((SlotGhostItem) slot).canBeAccessed()) { - return super.func_184996_a(slotId, dragType, clickTypeIn, player); + return super.slotClick(slotId, dragType, clickTypeIn, player); } if (slotStack != null && Utils.canCombine(slotStack, heldStack)) { @@ -140,7 +140,7 @@ public class ContainerItemRoutingNode extends Container } } - return super.func_184996_a(slotId, dragType, clickTypeIn, player); + return super.slotClick(slotId, dragType, clickTypeIn, player); } @Override diff --git a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java index fdea0350..4b7dab6f 100644 --- a/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java +++ b/src/main/java/WayofTime/bloodmagic/util/handler/EventHandler.java @@ -644,7 +644,7 @@ public class EventHandler for (int n = 0; n < numberExtra; n++) { ItemArrow itemarrow = (ItemArrow) Items.arrow; - EntityArrow entityarrow = itemarrow.makeTippedArrow(world, new ItemStack(Items.arrow), player); + EntityArrow entityarrow = itemarrow.createArrow(world, new ItemStack(Items.arrow), player); double velocityModifier = 0.6 * f; entityarrow.motionX += (random.nextDouble() - 0.5) * velocityModifier;