fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Initial 1.11.2 update

Browse Source
This commit is contained in:
Electroblob
2018-02-07 21:15:50 +00:00
parent 67f6be0671
commit 3df5597dcc
368 changed files with 17234 additions and 15082 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/item/ItemScroll.java
+17 -17
View File
@@ -1,7 +1,5 @@
package electroblob.wizardry.item;
import java.util.List;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.event.SpellCastEvent;
import electroblob.wizardry.event.SpellCastEvent.Source;
@@ -17,6 +15,7 @@ import net.minecraft.item.ItemStack;
import net.minecraft.util.ActionResult;
import net.minecraft.util.EnumActionResult;
import net.minecraft.util.EnumHand;
import net.minecraft.util.NonNullList;
import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
@@ -34,7 +33,7 @@ public class ItemScroll extends Item {
@Override
@SideOnly(Side.CLIENT)
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, List<ItemStack> list){
public void getSubItems(Item item, CreativeTabs par2CreativeTabs, NonNullList<ItemStack> list){
for(Spell spell : Spell.getSpells(Spell.nonContinuousSpells)){
list.add(new ItemStack(item, 1, spell.id()));
}
@@ -50,39 +49,40 @@ public class ItemScroll extends Item {
// Item's version of this method is, quite frankly, an abomination. Why is a deprecated method being used as such
// an integral part of the code? And what's the point in getUnlocalisedNameInefficiently?
public String getItemStackDisplayName(ItemStack stack){
/* Ok, so this method can be called from either the client or the server side. Obviously, on the client the
* spell name is either translated or obfuscated, then it is put into the item name as part of that translation.
* On the server side, however, there's a problem: on the one hand, the spell name shouldn't be obfuscated in
* case the server wants to do something with it, and in that case returning world-specific gobbledegook is
* not particularly helpful. On the other hand, something might happen that causes this method to be called on
* the server side, but the result to then be sent to the client, which means broken discovery system.
* Simply put, I can't predict that, and it's not my job to cater for other people's incorrect usage of code,
* especially when that might compromise some perfectly reasonable use (think Bibliocraft's 'best guess' book
* detection). */
* case the server wants to do something with it, and in that case returning world-specific gobbledegook is not
* particularly helpful. On the other hand, something might happen that causes this method to be called on the
* server side, but the result to then be sent to the client, which means broken discovery system. Simply put, I
* can't predict that, and it's not my job to cater for other people's incorrect usage of code, especially when
* that might compromise some perfectly reasonable use (think Bibliocraft's 'best guess' book detection). */
// TODO: Backport this proxy-based fix.
return Wizardry.proxy.getScrollDisplayName(stack);
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack stack, World world, EntityPlayer player, EnumHand hand){
public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand){
ItemStack stack = player.getHeldItem(hand);
Spell spell = Spell.get(stack.getItemDamage());
// By default, scrolls have no modifiers - but with the event system, they could be added.
SpellModifiers modifiers = new SpellModifiers();
// If anything stops the spell working at this point, nothing else happens.
if(MinecraftForge.EVENT_BUS.post(new SpellCastEvent.Pre(player, spell, modifiers, Source.SCROLL))){
return new ActionResult<ItemStack>(EnumActionResult.FAIL, stack);
}
if(!spell.isContinuous){
if(!world.isRemote){
if(spell.cast(world, player, hand, 0, new SpellModifiers())){
MinecraftForge.EVENT_BUS.post(new SpellCastEvent.Post(player, spell, modifiers, Source.SCROLL));
if(spell.doesSpellRequirePacket()){
@@ -92,12 +92,12 @@ public class ItemScroll extends Item {
}
// Scrolls are consumed upon successful use in survival mode
if(!player.capabilities.isCreativeMode) stack.stackSize--;
if(!player.capabilities.isCreativeMode) stack.shrink(1);
return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, stack);
}
// This else if check was bugging me for AGES! I can't believe I didn't compare to ItemWand before.
// This else if check was bugging me for AGES! I can't believe I didn't compare to ItemWand before.
}else if(!spell.doesSpellRequirePacket()){
// Client-inconsistent spell casting. This code only runs client-side.
if(spell.cast(world, player, hand, 0, modifiers)){