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

Some minor cleanup

Browse source 
* Hid Dimensional Portal from JEI and Creative
* Fixed stacktrace spam when invalid portal was stepped into
* Fixed tank rendering no model at all
* Fixed NBT saving for Dimensional Portal
This commit is contained in:
Nick 2016-02-23 22:47:28 -08:00
parent 5c5cda1917
commit 45710ebb8f
5 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java
View file

@ -44,6 +44,11 @@ public class BlockBloodTank extends BlockContainer
return new TileBloodTank();
}
@Override
public int getRenderType() {
return 3;
}
@Override
public boolean onBlockActivated(World world, BlockPos blockPos, IBlockState blockState, EntityPlayer player, EnumFacing side, float hitX, float hitY, float hitZ)
{

1
src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
View file

@ -33,7 +33,6 @@ public class BlockDimensionalPortal extends BlockIntegerContainer
super(Material.portal, 2);
setUnlocalizedName(Constants.Mod.MODID + ".dimensionalPortal");
setRegistryName(Constants.BloodMagicBlock.DIMENSIONAL_PORTAL.getRegName());
setCreativeTab(BloodMagic.tabBloodMagic);
setBlockUnbreakable();
setResistance(2000);
setLightOpacity(0);

3
src/main/java/WayofTime/bloodmagic/compat/jei/BloodMagicPlugin.java
View file

@ -21,6 +21,7 @@ import WayofTime.bloodmagic.registry.ModBlocks;
import WayofTime.bloodmagic.registry.ModItems;
import mezz.jei.api.*;
import net.minecraft.item.ItemStack;
import net.minecraftforge.oredict.OreDictionary;
import javax.annotation.Nonnull;
import java.util.Map;
@ -51,6 +52,7 @@ public class BloodMagicPlugin extends BlankModPlugin
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.spectralBlock));
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.phantomBlock));
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.alchemyArray));
jeiHelper.getItemBlacklist().addItemToBlacklist(new ItemStack(ModBlocks.dimensionalPortal, 1, OreDictionary.WILDCARD_VALUE));
for (Map.Entry<String, Integer> entry : LivingArmourHandler.upgradeMaxLevelMap.entrySet())
{
@ -67,6 +69,7 @@ public class BloodMagicPlugin extends BlankModPlugin
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.OWNER_UUID);
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.OWNER_NAME);
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.USES);
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.SOULS);
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.X_COORD);
jeiHelper.getNbtIgnoreList().ignoreNbtTagNames(Constants.NBT.Y_COORD);

1
src/main/java/WayofTime/bloodmagic/ritual/portal/LocationsHandler.java
View file

@ -62,7 +62,6 @@ public class LocationsHandler implements Serializable
return map;
} catch (IOException e)
{
e.printStackTrace();
return null;
} catch (ClassNotFoundException e)
{

5
src/main/java/WayofTime/bloodmagic/tile/TileDimensionalPortal.java
View file

@ -1,13 +1,14 @@
package WayofTime.bloodmagic.tile;
import WayofTime.bloodmagic.ritual.RitualPortal;
import com.google.common.base.Strings;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
public class TileDimensionalPortal extends TileEntity
{
public String portalID;
public String portalID = "";
public int masterStoneX;
public int masterStoneY;
public int masterStoneZ;
@ -32,7 +33,7 @@ public class TileDimensionalPortal extends TileEntity
{
super.writeToNBT(tagCompound);
tagCompound.setString(RitualPortal.PORTAL_ID_TAG, portalID);
tagCompound.setString(RitualPortal.PORTAL_ID_TAG, Strings.isNullOrEmpty(portalID) ? "" : portalID);
tagCompound.setInteger("masterStoneX", masterStoneX);
tagCompound.setInteger("masterStoneY", masterStoneY);