wadewegner
/
AncientWarfare2
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

1.12 port

This commit is contained in:
P3pp3rF1y 2017-09-14 18:04:48 +02:00
Родитель 15df5fc5e0
Коммит f8f2a8edef
13 изменённых файлов: 21 добавлений и 21 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
z_unused/TemplateRuleVanillaEntity.java
Просмотреть файл

@ -91,7 +91,7 @@ public void parseRuleData(NBTTagCompound tag)
}
@Override
public boolean shouldPlaceOnBuildPass(World world, int turns, int x, int y, int z, int buildPass)
public boolean shouldPlaceOnBuildPass(World world, int turns, BlockPos pos, int buildPass)
{
return buildPass==3;
}

2
z_unused/shadowmage/ancient_framework/common/item/AWItemBase.java
Просмотреть файл

@ -92,7 +92,7 @@ public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag)
{
if(tooltips.containsKey(stack.getItemDamage()))
{

2
z_unused/shadowmage/ancient_framework/common/item/AWItemBlockBase.java
Просмотреть файл

@ -74,7 +74,7 @@ public void getSubItems(int par1, CreativeTabs par2CreativeTabs, List par3List)
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag)
{
if(stack!=null)
{

2
z_unused/shadowmage/ancient_structures/common/item/ItemBuilderCreative.java
Просмотреть файл

@ -95,7 +95,7 @@ public boolean onUsedFinalLeft(World world, EntityPlayer player, ItemStack stack
ItemStructureSettings viewSettings = new ItemStructureSettings();
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag)
{
String structure = "none";
ItemStructureSettings.getSettingsFor(stack, viewSettings);

2
z_unused/shadowmage/ancient_structures/common/item/ItemSpawnerPlacer.java
Просмотреть файл

@ -87,7 +87,7 @@ public boolean onUsedFinalLeft(World world, EntityPlayer player, ItemStack stack
}
@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4)
public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag)
{
if(stack.hasTagCompound() && stack.getTagCompound().hasKey("spawnData"))
{

4
z_unused/shadowmage/ancient_structures/common/template/plugin/default_plugins/block_rules/TemplateRuleBlockDoors.java
Просмотреть файл

@ -27,9 +27,9 @@ import shadowmage.ancient_structures.common.manager.BlockDataManager;
public class TemplateRuleBlockDoors extends TemplateRuleVanillaBlocks
{
public TemplateRuleBlockDoors(World world, int x, int y, int z, Block block, int meta, int turns)
public TemplateRuleBlockDoors(World world, BlockPos pos, Block block, int meta, int turns)
{
super(world, x, y, z, block, meta, turns);
super(world, pos, block, meta, turns);
}
public TemplateRuleBlockDoors()

4
z_unused/shadowmage/ancient_structures/common/template/plugin/default_plugins/block_rules/TemplateRuleBlockInventory.java
Просмотреть файл

@ -35,9 +35,9 @@ public class TemplateRuleBlockInventory extends TemplateRuleVanillaBlocks
public int randomLootLevel = 0;
public NBTTagCompound tag = new NBTTagCompound();
public TemplateRuleBlockInventory(World world, int x, int y, int z, Block block, int meta, int turns)
public TemplateRuleBlockInventory(World world, BlockPos pos, Block block, int meta, int turns)
{
super(world, x, y, z, block, meta, turns);
super(world, pos, block, meta, turns);
TileEntity te = world.getBlockTileEntity(x, y, z);
if(te instanceof IInventory)
{

4
z_unused/shadowmage/ancient_structures/common/template/plugin/default_plugins/block_rules/TemplateRuleBlockLogic.java
Просмотреть файл

@ -30,9 +30,9 @@ public class TemplateRuleBlockLogic extends TemplateRuleVanillaBlocks
public NBTTagCompound tag = new NBTTagCompound();
public TemplateRuleBlockLogic(World world, int x, int y, int z, Block block, int meta, int turns)
public TemplateRuleBlockLogic(World world, BlockPos pos, Block block, int meta, int turns)
{
super(world, x, y, z, block, meta, turns);
super(world, pos, block, meta, turns);
TileEntity te = world.getBlockTileEntity(x, y, z);
te.writeToNBT(tag);
}

4
z_unused/shadowmage/ancient_structures/common/template/plugin/default_plugins/block_rules/TemplateRuleBlockSign.java
Просмотреть файл

@ -33,9 +33,9 @@ public class TemplateRuleBlockSign extends TemplateRuleVanillaBlocks
public String signContents[];
public boolean wall = true;
public TemplateRuleBlockSign(World world, int x, int y, int z, Block block, int meta, int turns)
public TemplateRuleBlockSign(World world, BlockPos pos, Block block, int meta, int turns)
{
super(world, x, y, z, block, meta, turns);
super(world, pos, block, meta, turns);
TileEntitySign te = (TileEntitySign) world.getBlockTileEntity(x, y, z);
signContents = new String[te.signText.length];
for(int i = 0; i < signContents.length; i++)

6
z_unused/shadowmage/ancient_structures/common/template/plugin/default_plugins/block_rules/TemplateRuleModBlocks.java
Просмотреть файл

@ -36,9 +36,9 @@ public class TemplateRuleModBlocks extends TemplateRuleBlock
public String blockName;
public int meta;
public TemplateRuleModBlocks(World world, int x, int y, int z, Block block, int meta, int turns)
public TemplateRuleModBlocks(World world, BlockPos pos, Block block, int meta, int turns)
{
super(world, x, y, z, block, meta, turns);
super(world, pos, block, meta, turns);
this.blockName = BlockDataManager.getBlockName(block);
this.meta = meta;
}
@ -84,7 +84,7 @@ public void addResources(List<ItemStack> resources)
}
@Override
public boolean shouldPlaceOnBuildPass(World world, int turns, int x, int y, int z, int buildPass)
public boolean shouldPlaceOnBuildPass(World world, int turns, BlockPos pos, int buildPass)
{
return buildPass==0;
}

6
z_unused/shadowmage/ancient_structures/common/template/plugin/default_plugins/block_rules/TemplateRuleVanillaBlocks.java
Просмотреть файл

@ -48,9 +48,9 @@ public int buildPass = 0;
* @param block
* @param meta
*/
public TemplateRuleVanillaBlocks(World world, int x, int y, int z, Block block, int meta, int turns)
public TemplateRuleVanillaBlocks(World world, BlockPos pos, Block block, int meta, int turns)
{
super(world, x, y, z, block, meta, turns);
super(world, pos, block, meta, turns);
this.blockName = BlockDataManager.getBlockName(block);
this.meta = BlockDataManager.getRotatedMeta(block, meta, turns);
this.buildPass = BlockDataManager.getBlockPriority(block.blockID, meta);
@ -87,7 +87,7 @@ public void addResources(List<ItemStack> resources)
}
@Override
public boolean shouldPlaceOnBuildPass(World world, int turns, int x, int y, int z, int buildPass)
public boolean shouldPlaceOnBuildPass(World world, int turns, BlockPos pos, int buildPass)
{
return buildPass == this.buildPass;
}

2
z_unused/shadowmage/ancient_structures/common/template/plugin/default_plugins/entity_rules/TemplateRuleVanillaEntity.java
Просмотреть файл

@ -87,7 +87,7 @@ public void parseRuleData(NBTTagCompound tag)
}
@Override
public boolean shouldPlaceOnBuildPass(World world, int turns, int x, int y, int z, int buildPass)
public boolean shouldPlaceOnBuildPass(World world, int turns, BlockPos pos, int buildPass)
{
return buildPass==3;
}

2
z_unused/shadowmage/ancient_structures/common/template/rule/TemplateRuleBlock.java
Просмотреть файл

@ -27,7 +27,7 @@ import net.minecraft.world.World;
public abstract class TemplateRuleBlock extends TemplateRule
{
public TemplateRuleBlock(World world, int x, int y, int z, Block block, int meta, int turns)
public TemplateRuleBlock(World world, BlockPos pos, Block block, int meta, int turns)
{
}