Skip to content
This repository has been archived by the owner on May 13, 2023. It is now read-only.

Commit

Permalink
Update mappings + dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
TehNut committed Feb 1, 2019
1 parent 1426e49 commit 83f0eef
Show file tree
Hide file tree
Showing 147 changed files with 224 additions and 223 deletions.
10 changes: 5 additions & 5 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ mod_name=BloodMagic
package_group=com.wayoftime.bloodmagic
mod_version=2.3.3
mc_version=1.12.2
forge_version=14.23.2.2611
forge_version=14.23.5.2808
curse_id=224791

mappings_version=snapshot_20180201
mappings_version=stable_39

jei_version=4.8.5.147
waila_version=1.8.23-B38_1.12
guideapi_version=1.12-2.1.4-57
jei_version=4.14.4.264
waila_version=1.8.26-B41_1.12.2
guideapi_version=1.12-2.1.8-63
4 changes: 2 additions & 2 deletions src/main/java/WayofTime/bloodmagic/BloodMagic.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,13 @@ public class BloodMagic {
public static final RitualManager RITUAL_MANAGER = new RitualManager(new Configuration(new File(Loader.instance().getConfigDir(), MODID + "/" + "rituals.cfg")));
public static final CreativeTabs TAB_BM = new CreativeTabs(MODID + ".creativeTab") {
@Override
public ItemStack getTabIconItem() {
public ItemStack createIcon() {
return OrbRegistry.getOrbStack(RegistrarBloodMagic.ORB_WEAK);
}
};
public static CreativeTabs TAB_TOMES = new CreativeTabs(MODID + ".creativeTabTome") {
@Override
public ItemStack getTabIconItem() {
public ItemStack createIcon() {
return new ItemStack(RegistrarBloodMagicItems.UPGRADE_TOME);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ public void renderAt(TileEntity tile, double x, double y, double z, float craftT
EnumFacing sideHit = EnumFacing.UP;
EnumFacing rotation = tileArray.getRotation();

GlStateManager.translate(sideHit.getFrontOffsetX() * offsetFromFace, sideHit.getFrontOffsetY() * offsetFromFace, sideHit.getFrontOffsetZ() * offsetFromFace);
GlStateManager.translate(sideHit.getXOffset() * offsetFromFace, sideHit.getYOffset() * offsetFromFace, sideHit.getZOffset() * offsetFromFace);

switch (sideHit) {
case DOWN:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class BlockAlchemyArray extends Block {
public BlockAlchemyArray() {
super(Material.CLOTH);

setUnlocalizedName(BloodMagic.MODID + ".alchemyArray");
setTranslationKey(BloodMagic.MODID + ".alchemyArray");
setHardness(0.1f);
}

Expand All @@ -46,7 +46,7 @@ public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos
}

@Override
public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState state, Entity entity) {
public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) {
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileAlchemyArray) {
((TileAlchemyArray) tile).onEntityCollidedWithBlock(state, entity);
Expand All @@ -60,7 +60,7 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, Bloc

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public BlockAlchemyTable() {
super(Material.ROCK);
// this.setDefaultState(this.blockState.getBaseState().withProperty(DIRECTION, EnumFacing.DOWN).withProperty(INVISIBLE, false));

setUnlocalizedName(BloodMagic.MODID + ".alchemyTable");
setTranslationKey(BloodMagic.MODID + ".alchemyTable");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/WayofTime/bloodmagic/block/BlockAltar.java
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ public class BlockAltar extends Block implements IVariantProvider, IDocumentedBl
public BlockAltar() {
super(Material.ROCK);

setUnlocalizedName(BloodMagic.MODID + ".altar");
setTranslationKey(BloodMagic.MODID + ".altar");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class BlockBloodLight extends Block {
public BlockBloodLight() {
super(Material.CLOTH);

setUnlocalizedName(BloodMagic.MODID + ".bloodLight");
setTranslationKey(BloodMagic.MODID + ".bloodLight");
}

@Override
Expand All @@ -49,7 +49,7 @@ public boolean isReplaceable(IBlockAccess world, BlockPos pos) {

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class BlockBloodRune extends BlockEnum<BloodRuneType> implements IBloodRu
public BlockBloodRune() {
super(Material.ROCK, BloodRuneType.class);

setUnlocalizedName(BloodMagic.MODID + ".rune.");
setTranslationKey(BloodMagic.MODID + ".rune.");
setCreativeTab(BloodMagic.TAB_BM);
setSoundType(SoundType.STONE);
setHardness(2.0F);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public class BlockBloodTank extends BlockInteger implements IVariantProvider, IB
public BlockBloodTank() {
super(Material.IRON, TileBloodTank.CAPACITIES.length - 1, "tier");

setUnlocalizedName(BloodMagic.MODID + ".bloodTank");
setTranslationKey(BloodMagic.MODID + ".bloodTank");
setHardness(2.0F);
setResistance(5.0F);
setSoundType(SoundType.GLASS);
Expand All @@ -60,7 +60,7 @@ public EnumBlockRenderType getRenderType(IBlockState state) {

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.CUTOUT_MIPPED;
}

Expand Down Expand Up @@ -91,7 +91,7 @@ public boolean onBlockActivated(World world, BlockPos blockPos, IBlockState stat
if (success) {
world.checkLight(blockPos);
world.updateComparatorOutputLevel(blockPos, this);
world.markAndNotifyBlock(blockPos, world.getChunkFromBlockCoords(blockPos), state, state, 3);
world.markAndNotifyBlock(blockPos, world.getChunk(blockPos), state, state, 3);
return true;
}

Expand Down Expand Up @@ -138,7 +138,7 @@ public void onBlockPlacedBy(World world, BlockPos pos, IBlockState blockState, E

world.checkLight(pos);
world.updateComparatorOutputLevel(pos, this);
world.markAndNotifyBlock(pos, world.getChunkFromBlockCoords(pos), blockState, blockState, 3);
world.markAndNotifyBlock(pos, world.getChunk(pos), blockState, blockState, 3);
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class BlockDecorative extends BlockEnum<EnumDecorative> {
public BlockDecorative() {
super(Material.ROCK, EnumDecorative.class);

setUnlocalizedName(BloodMagic.MODID + ".");
setTranslationKey(BloodMagic.MODID + ".");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class BlockDemonBase<E extends Enum<E> & IStringSerializable> extends Blo
public BlockDemonBase(String baseName, Class<E> enumClass) {
super(Material.ROCK, enumClass);

setUnlocalizedName(BloodMagic.MODID + "." + baseName + ".");
setTranslationKey(BloodMagic.MODID + "." + baseName + ".");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public class BlockDemonCrucible extends Block implements IVariantProvider, IBMBl
public BlockDemonCrucible() {
super(Material.ROCK);

setUnlocalizedName(BloodMagic.MODID + ".demonCrucible");
setTranslationKey(BloodMagic.MODID + ".demonCrucible");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public BlockDemonCrystal() {
super(Material.ROCK);
this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumDemonWillType.DEFAULT).withProperty(ATTACHED, EnumFacing.UP));

setUnlocalizedName(BloodMagic.MODID + ".demonCrystal.");
setTranslationKey(BloodMagic.MODID + ".demonCrystal.");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr
public BlockDemonCrystallizer() {
super(Material.ROCK);

setUnlocalizedName(BloodMagic.MODID + ".demonCrystallizer");
setTranslationKey(BloodMagic.MODID + ".demonCrystallizer");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class BlockDemonLight extends BlockEnum<EnumSubWillType> {
public BlockDemonLight() {
super(Material.ROCK, EnumSubWillType.class);

setUnlocalizedName(BloodMagic.MODID + ".demonlight.");
setTranslationKey(BloodMagic.MODID + ".demonlight.");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class BlockDemonPillarBase<E extends Enum<E> & IStringSerializable> exten
public BlockDemonPillarBase(String baseName, Material materialIn, Class<E> enumClass) {
super(materialIn, enumClass);

setUnlocalizedName(BloodMagic.MODID + "." + baseName + ".");
setTranslationKey(BloodMagic.MODID + "." + baseName + ".");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class BlockDemonPillarCapBase<E extends Enum<E> & IStringSerializable> ex
public BlockDemonPillarCapBase(String baseName, Material materialIn, Class<E> enumClass) {
super(materialIn, enumClass);

setUnlocalizedName(BloodMagic.MODID + "." + baseName + ".");
setTranslationKey(BloodMagic.MODID + "." + baseName + ".");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public class BlockDemonPylon extends BlockContainer implements IBMBlock, IVarian
public BlockDemonPylon() {
super(Material.ROCK);

setUnlocalizedName(BloodMagic.MODID + ".demonPylon");
setTranslationKey(BloodMagic.MODID + ".demonPylon");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class BlockDemonStairsBase<E extends Enum<E> & IStringSerializable> exten
public BlockDemonStairsBase(String baseName, Material materialIn, Class<E> enumClass) {
super(materialIn, enumClass);

setUnlocalizedName(BloodMagic.MODID + "." + baseName + ".");
setTranslationKey(BloodMagic.MODID + "." + baseName + ".");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class BlockDemonWallBase<E extends Enum<E> & IStringSerializable> extends
public BlockDemonWallBase(String baseName, Material materialIn, Class<E> enumClass) {
super(materialIn, enumClass);

setUnlocalizedName(BloodMagic.MODID + "." + baseName + ".");
setTranslationKey(BloodMagic.MODID + "." + baseName + ".");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class BlockDimensionalPortal extends BlockInteger {

public BlockDimensionalPortal() {
super(Material.PORTAL, 2);
setUnlocalizedName(BloodMagic.MODID + ".dimensionalPortal");
setTranslationKey(BloodMagic.MODID + ".dimensionalPortal");
setBlockUnbreakable();
setResistance(2000);
setLightOpacity(0);
Expand Down Expand Up @@ -72,7 +72,7 @@ public int getLightValue(IBlockState state, IBlockAccess world, BlockPos pos) {
}

@Override
public void onEntityCollidedWithBlock(World world, BlockPos pos, IBlockState blockState, Entity entity) {
public void onEntityCollision(World world, BlockPos pos, IBlockState blockState, Entity entity) {
if (!world.isRemote && world.getTileEntity(pos) instanceof TileDimensionalPortal) {
TileDimensionalPortal tile = (TileDimensionalPortal) world.getTileEntity(pos);

Expand Down Expand Up @@ -129,7 +129,7 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess world, Block

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.TRANSLUCENT;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public class BlockIncenseAltar extends Block implements IVariantProvider, IBMBlo
public BlockIncenseAltar() {
super(Material.ROCK);

setUnlocalizedName(BloodMagic.MODID + ".incenseAltar");
setTranslationKey(BloodMagic.MODID + ".incenseAltar");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class BlockInputRoutingNode extends BlockRoutingNode {
public BlockInputRoutingNode() {
super();

setUnlocalizedName(BloodMagic.MODID + ".inputRouting");
setTranslationKey(BloodMagic.MODID + ".inputRouting");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class BlockInversionPillar extends BlockEnum<EnumSubWillType> {
public BlockInversionPillar() {
super(Material.ROCK, EnumSubWillType.class);

setUnlocalizedName(BloodMagic.MODID + ".inversionpillar.");
setTranslationKey(BloodMagic.MODID + ".inversionpillar.");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public class BlockInversionPillarEnd extends BlockEnum<EnumInversionCap> impleme
public BlockInversionPillarEnd() {
super(Material.ROCK, EnumInversionCap.class);

setUnlocalizedName(BloodMagic.MODID + ".inversionpillarend.");
setTranslationKey(BloodMagic.MODID + ".inversionpillarend.");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public class BlockItemRoutingNode extends BlockRoutingNode {
public BlockItemRoutingNode() {
super();

setUnlocalizedName(BloodMagic.MODID + ".itemRouting");
setTranslationKey(BloodMagic.MODID + ".itemRouting");
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class BlockLifeEssence extends BlockFluidClassic {
public BlockLifeEssence() {
super(LIFE_ESSENCE, Material.WATER);

setUnlocalizedName(BloodMagic.MODID + ".fluid.lifeEssence");
setTranslationKey(BloodMagic.MODID + ".fluid.lifeEssence");
getLifeEssence().setBlock(this);
}

Expand All @@ -36,7 +36,7 @@ public boolean displaceIfPossible(World world, BlockPos blockPos) {
}

@Override
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.SOLID;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ public class BlockMasterRoutingNode extends BlockRoutingNode {
public BlockMasterRoutingNode() {
super();

setUnlocalizedName(BloodMagic.MODID + ".masterRouting");
setTranslationKey(BloodMagic.MODID + ".masterRouting");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/WayofTime/bloodmagic/block/BlockMimic.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public class BlockMimic extends BlockEnum<EnumMimic> implements IAltarComponent
public BlockMimic() {
super(Material.ROCK, EnumMimic.class);

setUnlocalizedName(BloodMagic.MODID + ".mimic.");
setTranslationKey(BloodMagic.MODID + ".mimic.");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public class BlockOutputRoutingNode extends BlockRoutingNode {
public BlockOutputRoutingNode() {
super();

setUnlocalizedName(BloodMagic.MODID + ".outputRouting");
setTranslationKey(BloodMagic.MODID + ".outputRouting");
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/WayofTime/bloodmagic/block/BlockPath.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class BlockPath extends BlockEnum<EnumPath> implements IIncensePath {
public BlockPath() {
super(Material.ROCK, EnumPath.class);

setUnlocalizedName(BloodMagic.MODID + ".path.");
setTranslationKey(BloodMagic.MODID + ".path.");
setCreativeTab(BloodMagic.TAB_BM);
setHardness(2.0F);
setResistance(5.0F);
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class BlockPhantom extends Block implements IVariantProvider {
public BlockPhantom() {
super(Material.CLOTH);

setUnlocalizedName(BloodMagic.MODID + ".phantom");
setTranslationKey(BloodMagic.MODID + ".phantom");
setCreativeTab(BloodMagic.TAB_BM);
}

Expand Down Expand Up @@ -54,7 +54,7 @@ public EnumBlockRenderType getRenderType(IBlockState state) {

@Override
@SideOnly(Side.CLIENT)
public BlockRenderLayer getBlockLayer() {
public BlockRenderLayer getRenderLayer() {
return BlockRenderLayer.TRANSLUCENT;
}

Expand Down
Loading

0 comments on commit 83f0eef

Please sign in to comment.