Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-26 16:58:34 +01:00
Code Issues Projects Releases Wiki Activity

Closes #885

Browse source
This commit is contained in:
Shadows_of_Fire 2017-10-31 18:01:15 -04:00
parent c09ebe299a
commit 585777b9e0
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/de/ellpeck/actuallyadditions/mod/crafting/MiscCrafting.java
View file

@ -98,6 +98,9 @@ public final class MiscCrafting{
new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()), new ItemStack(InitItems.itemMisc, 1, TheMiscItems.QUARTZ.ordinal()),
new ItemStack(Items.PRISMARINE_SHARD)); new ItemStack(Items.PRISMARINE_SHARD));
ItemCrafting.recipeEnderStar = RecipeUtil.lastIRecipe(); ItemCrafting.recipeEnderStar = RecipeUtil.lastIRecipe();
//Spawner Shard -> ingot
GameRegistry.addSmelting(new ItemStack(InitItems.itemMisc, 1, TheMiscItems.SPAWNER_SHARD.ordinal()), new ItemStack(Items.IRON_INGOT, 2), 5F);
} }
} }

4
src/main/java/de/ellpeck/actuallyadditions/mod/items/ItemFillingWand.java
View file

@ -70,8 +70,6 @@ public class ItemFillingWand extends ItemEnergy{
stack.getTagCompound().setInteger("state", Block.getStateId(state)); stack.getTagCompound().setInteger("state", Block.getStateId(state));
} }
//I think changing these to state ID is a good idea, but it will break all currently in-use wands, but whatever. It'll have to be done in 1.13 anyway.
private static IBlockState loadBlock(ItemStack stack){ private static IBlockState loadBlock(ItemStack stack){
if(stack.hasTagCompound()){ if(stack.hasTagCompound()){
return Block.getStateById(stack.getTagCompound().getInteger("state")); return Block.getStateById(stack.getTagCompound().getInteger("state"));
@ -174,7 +172,7 @@ public class ItemFillingWand extends ItemEnergy{
world.setBlockState(pos, replaceState, 2); world.setBlockState(pos, replaceState, 2);
SoundType sound = replaceState.getBlock().getSoundType(replaceState, world, pos, player); SoundType sound = replaceState.getBlock().getSoundType(replaceState, world, pos, player);
world.playSound(null, pos, sound.getPlaceSound(), SoundCategory.BLOCKS, (sound.getVolume()+1.0F)/2.0F, sound.getPitch()*0.8F); world.playSound(null, pos, sound.getPlaceSound(), SoundCategory.BLOCKS, sound.getVolume()/2F + .5F, sound.getPitch()*0.8F);
if(!creative){ if(!creative){
this.extractEnergyInternal(stack, energyUse, false); this.extractEnergyInternal(stack, energyUse, false);