lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Initial stab at 1.11

Browse source 
About halfway.
This commit is contained in:
Nicholas Ignoffo 2016-12-12 19:56:36 -08:00
parent ce52aea512
commit 00d6f8eb46
157 changed files with 1036 additions and 1554 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/WayofTime/bloodmagic/api/recipe/AlchemyTableRecipe.java
View file

@ -15,7 +15,7 @@ import net.minecraftforge.oredict.OreDictionary;
public class AlchemyTableRecipe
{
protected ItemStack output = null;
protected ArrayList<Object> input = new ArrayList<Object>();
protected ArrayList<ItemStack> input = new ArrayList<ItemStack>();
@Getter
protected int lpDrained;
@Getter
@ -148,7 +148,7 @@ public class AlchemyTableRecipe
*
* @return The recipes input vales.
*/
public ArrayList<Object> getInput()
public ArrayList<ItemStack> getInput()
{
return this.input;
}

2
src/main/java/WayofTime/bloodmagic/api/registry/RitualRegistry.java
View file

@ -5,6 +5,7 @@ import WayofTime.bloodmagic.api.ritual.Ritual;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import javax.annotation.Nullable;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
@ -57,6 +58,7 @@ public class RitualRegistry
registerRitual(ritual, ritual.getName());
}
@Nullable
public static Ritual getRitualForId(String id)
{
Ritual ritual = registry.get(id);

2
src/main/java/WayofTime/bloodmagic/api/teleport/TeleporterBloodMagic.java
View file

@ -33,6 +33,6 @@ public class TeleporterBloodMagic extends Teleporter
@Override
public void placeInPortal(Entity entity, float rotationYaw)
{
entity.setLocationAndAngles(MathHelper.floor_double(entity.posX), MathHelper.floor_double(entity.posY) + 2, MathHelper.floor_double(entity.posZ), entity.rotationYaw, entity.rotationPitch);
entity.setLocationAndAngles(MathHelper.floor(entity.posX), MathHelper.floor(entity.posY) + 2, MathHelper.floor(entity.posZ), entity.rotationYaw, entity.rotationPitch);
}
}